Index: tensions/floOS/OS_default/identification.tpl
===================================================================
--- /extensions/floOS/OS_default/identification.tpl	(revision 9674)
+++ 	(revision )
@@ -1,71 +1,0 @@
-{* $Id: identification.tpl 2352 2008-05-20 00:27:26Z patdenice $ *}
-<div id="content" class="content">
-
-  <div class="titrePage">
-    <ul class="categoryActions">
-      <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
-      {if isset($U_REGISTER) }
-      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
-      {/if}
-      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
-    </ul>
-    <h2>{'Identification'|@translate}</h2>
-  </div>
-
-  {if isset($errors) }
-  <div class="errors">
-    <ul>
-      {foreach from=$errors item=error}
-      <li>{$error}</li>
-      {/foreach}
-    </ul>
-  </div>
-  {/if}
-
-<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
-  <fieldset>
-    <legend>{'Connection settings'|@translate}</legend>
-
-    <input type="hidden" name="redirect" value="{$U_REDIRECT}">
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="username">{'Username'|@translate}</label>
-        </span>
-        <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" />
-      </li>
-
-      <li>
-        <span class="property">
-          <label for="password">{'Password'|@translate}</label>
-        </span>
-        <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" />
-      </li>
-
-      {if $authorize_remembering }
-      <li>
-        <span class="property">
-          <label for="remember_me">{'remember_me'|@translate}</label>
-        </span>
-        <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
-      </li>
-      {/if}
-    </ul>
-  </fieldset>
-
-  <p><input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"></p>
-
-  <p>
-    {if isset($U_REGISTER) }
-    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
-    {/if}
-    <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"> {'Forgot your password?'|@translate}</a>
-  </p>
-</form>
-
-<script type="text/javascript"><!--
-document.login_form.username.focus();
-//--></script>
-
-</div> <!-- content -->
Index: /extensions/floOS/OS_default/index.php
===================================================================
--- /extensions/floOS/OS_default/index.php	(revision 9675)
+++ /extensions/floOS/OS_default/index.php	(revision 9675)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/floOS/OS_default/template/index.tpl
===================================================================
--- /extensions/floOS/OS_default/template/index.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/index.tpl	(revision 9675)
@@ -8,69 +8,80 @@
       <td id="section_up">
 	  	  <div class="titrePage">
-		<ul class="categoryActions">
-		  {if !empty($image_orders) }
-		  <li>
-		  {'Sort order'|@translate}:
-		  <select onchange="document.location = this.options[this.selectedIndex].value;">
-			{foreach from=$image_orders item=image_order }
-			<option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
-			{/foreach}
-		  </select>
-		  </li>
-		  {/if}
-	
-		  {if isset($U_CADDIE) }
-		  <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"/></a></li>
-		  {/if}
-	
-		  {if isset($U_EDIT) }
-		  <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
-		  {/if}
-	
-		  {if isset($U_SEARCH_RULES) }
-		  <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)" /></a></li>
-		  {/if}
-	
-		  {if isset($U_SLIDESHOW) }
-		  <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
-		  {/if}
-	
-		  {if isset($U_MODE_FLAT) }
-		  <li><a href="{$U_MODE_FLAT}" title="{'display all elements in all sub-categories'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'display all elements in all sub-categories'|@translate}" /></a></li>
-		  {/if}
-	
-		  {if isset($U_MODE_NORMAL) }
-		  <li><a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'return to normal view mode'|@translate}" /></a></li>
-		  {/if}
-	
-		  {if isset($U_MODE_POSTED) }
-		  <li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'display a calendar by posted date'|@translate}" /></a></li>
-		  {/if}
-		  
-		  {if isset($U_MODE_CREATED) }
-		  <li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'display a calendar by creation date'|@translate}" /></a></li>
-		  {/if}
-		  
-		  {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
-		</ul>
-	
-	  <h2>{$TITLE}</h2>
-	
-	  {if isset($chronology_views) }
-	  <div class="calendarViews">{'calendar_view'|@translate}:
-		<select onchange="document.location = this.options[this.selectedIndex].value;">
-		  {foreach from=$chronology_views item=view}
-		  <option value="{$view.VALUE}"{if $view.SELECTED} selected="selected"{/if}>{$view.CONTENT}</option>
-		  {/foreach}
-		</select>
-	  </div>
-	  {/if}
-	
-	  {if isset($chronology.TITLE) }
-	  <h2>{$chronology.TITLE}</h2>
-	  {/if}
-	
-	  </div> <!-- titrePage -->
-
+          <ul class="categoryActions">
+            {if !empty($image_orders)}
+                <li>{'Sort order'|@translate}: {strip}
+                <select onchange="document.location = this.options[this.selectedIndex].value;">
+                  {foreach from=$image_orders item=image_order}
+                  <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
+                  {/foreach}
+                </select>
+            {/strip}</li>
+            {/if}
+            {if isset($favorite)}
+                <li><a href="{$favorite.U_FAVORITE}" title="{'delete all photos from your favorites'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-favorite-del"> </span><span class="pwg-button-text">{'delete all photos from your favorites'|@translate}</span>
+                </a></li>
+            {/if}
+            {if isset($U_CADDIE)}
+                <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button">
+                  <span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span>
+                </a></li>
+            {/if}
+            {if isset($U_EDIT)}
+                <li><a href="{$U_EDIT}" title="{'edit'|@translate}" class="pwg-state-default pwg-button">
+                  <span class="pwg-icon pwg-icon-category-edit"> </span><span class="pwg-button-text">{'edit'|@translate}</span>
+                </a></li>
+            {/if}
+            {if isset($U_SEARCH_RULES)}
+                {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+                <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-help"> </span><span class="pwg-button-text">(?)</span>
+                </a></li>
+            {/if}
+            {if isset($U_SLIDESHOW)}
+                <li>{strip}<a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span>
+                </a>{/strip}</li>
+            {/if}
+            {if isset($U_MODE_FLAT)}
+                <li>{strip}<a href="{$U_MODE_FLAT}" title="{'display all photos in all sub-albums'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-category-view-flat"> </span><span class="pwg-button-text">{'display all photos in all sub-albums'|@translate}</span>
+                </a>{/strip}</li>
+            {/if}
+            {if isset($U_MODE_NORMAL)}
+                <li>{strip}<a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}" class="pwg-state-default pwg-button">
+                  <span class="pwg-icon pwg-icon-category-view-normal"> </span><span class="pwg-button-text">{'return to normal view mode'|@translate}</span>
+                </a>{/strip}</li>
+            {/if}
+            {if isset($U_MODE_POSTED)}
+                <li>{strip}<a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span>
+                </a>{/strip}</li>
+            {/if}
+            {if isset($U_MODE_CREATED)}
+                <li>{strip}<a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                  <span class="pwg-icon pwg-icon-camera-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span>
+                </a>{/strip}</li>
+            {/if}
+            {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
+          </ul>
+        
+        <h2>{$TITLE}</h2>
+        
+        {if isset($chronology_views)}
+        <div class="calendarViews">{'View'|@translate}:
+          <select onchange="document.location = this.options[this.selectedIndex].value;">
+            {foreach from=$chronology_views item=view}
+            <option value="{$view.VALUE}"{if $view.SELECTED} selected="selected"{/if}>{$view.CONTENT}</option>
+            {/foreach}
+          </select>
+        </div>
+        {/if}
+        
+        {if isset($chronology.TITLE)}
+        <h2>{$chronology.TITLE}</h2>
+        {/if}
+            
+			</div>{* <!-- titrePage --> *}  
 	  </td>
       <td id="section_up_right">&nbsp;</td>
@@ -79,45 +90,49 @@
       <td id="section_left">&nbsp;</td>
       <td id="section_in">
-		{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
-		
-		{if !empty($category_search_results) }
-		<div style="font-size:16px;text-align:left;margin:10px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
-		  <em><strong>
-		  {foreach from=$category_search_results item=res name=res_loop}
-		  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
-		  {$res}
-		  {/foreach}
-		  </strong></em>
-		</div>
-		{/if}
-		
-		{if !empty($tag_search_results) }
-		<div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
-		  <em><strong>
-		  {foreach from=$tag_search_results item=res name=res_loop}
-		  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
-		  {$res}
-		  {/foreach}
-		  </strong></em>
-		</div>
-		{/if}
-		
-		{if isset($FILE_CHRONOLOGY_VIEW) }
-		{include file=$FILE_CHRONOLOGY_VIEW}
-		{/if}
-		
-		{if !empty($CATEGORIES) }{$CATEGORIES}{/if}
-		{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if}
-		
-		
-		{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
-		
-		{if !empty($CONTENT_DESCRIPTION) }
-		<div class="additional_info">
-		  {$CONTENT_DESCRIPTION}
-		</div>
-		{/if}
-		
-		{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if}
+
+        {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
+        
+        {if !empty($category_search_results)}
+        <div style="font-size:16px;margin:10px 16px">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+          <em><strong>
+          {foreach from=$category_search_results item=res name=res_loop}
+          {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+          {$res}
+          {/foreach}
+          </strong></em>
+        </div>
+        {/if}
+        
+        {if !empty($tag_search_results)}
+        <div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+          <em><strong>
+          {foreach from=$tag_search_results item=res name=res_loop}
+          {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+          {$res}
+          {/foreach}
+          </strong></em>
+        </div>
+        {/if}
+        
+        {if isset($FILE_CHRONOLOGY_VIEW)}
+        {include file=$FILE_CHRONOLOGY_VIEW}
+        {/if}
+        
+        {if !empty($CONTENT_DESCRIPTION)}
+        <div class="additional_info">
+          {$CONTENT_DESCRIPTION}
+        </div>
+        {/if}
+        
+        {if !empty($CATEGORIES)}{$CATEGORIES}{/if}
+        {if !empty($THUMBNAILS)}
+        <ul class="thumbnails" id="thumbnails">
+        {$THUMBNAILS}
+        </ul>
+        {/if}
+        
+        {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+        
+        {if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
       </td>
 	  <td id="section_right">&nbsp;</td>
Index: tensions/floOS/OS_default/template/menubar_calendar.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_calendar.tpl	(revision 9674)
+++ 	(revision )
@@ -1,85 +1,0 @@
-{if !empty($chronology_navigation_bars) }
-{foreach from=$chronology_navigation_bars item=bar}
-<div class="calendarBar">
-	{if isset($bar.previous)}
-		<div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
-	{/if}
-	{if isset($bar.next)}
-		<div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
-	{/if}
-	{if empty($bar.items)}
-		&nbsp;
-	{else}
-		{foreach from=$bar.items item=item}
-		<span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d image', '%d images', $item.NB_IMAGES)}"{/if}>
-		{if isset($item.URL)}
-		<a href="{$item.URL}">{$item.LABEL}</a>
-		{else}
-		{$item.LABEL}
-		{/if}
-		</span>
-		{/foreach}
-	{/if}
-</div>
-{/foreach}
-{/if}
-
-{if !empty($chronology_calendar.calendar_bars) }
-{foreach from=$chronology_calendar.calendar_bars item=bar}
-<div class="calendarCalBar">
-	<span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br>
-	{foreach from=$bar.items item=item}
-	<span class="calCal{if !isset($item.URL)}Empty{/if}">
-	{if isset($item.URL)}
-	<a href="{$item.URL}">{$item.LABEL}</a>
-	{else}
-	{$item.LABEL}
-	{/if}
-	{if isset($item.NB_IMAGES)}({$item.NB_IMAGES}){/if}
-	</span>
-	{/foreach}
-</div>
-{/foreach}
-{/if}
-
-{if isset($chronology_calendar.month_view) }
-<table class="calMonth">
- <thead>
- <tr>
- {foreach from=$chronology_calendar.month_view.wday_labels item=wday}
-	<td class="calDayHead">{$wday}</td>
- {/foreach}
- </tr>
- </thead>
-{html_head} {*add the style to html head for strict standard compliance*}
-<style type="text/css">
-TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
-  width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;
-}
-</style>
-{/html_head}
- {foreach from=$chronology_calendar.month_view.weeks item=week}
- <tr>
- 	{foreach from=$week item=day}
- 	{if !empty($day)}
- 		{if isset($day.IMAGE)}
- 			<td class="calDayCellFull">
-	 			<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
-	 			<div class="calImg">
-					<a href="{$day.U_IMG_LINK}">
-			  			<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d image','%d images', $day.NB_ELEMENTS)}">
-					</a>
-				</div>
- 		{else}
- 			<td class="calDayCellEmpty">{$day.DAY}
- 		{/if}
- 	{else}{*blank cell first or last row only*}
- 		<td>
- 	{/if}
- 	</td>
- 	{/foreach} {*day in week*}
- </tr>
- {/foreach}  {*week in month*}
-</table>
-{/if}
-
Index: /extensions/floOS/OS_default/template/menubar_categories.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_categories.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_categories.tpl	(revision 9675)
@@ -1,10 +1,2 @@
-{if isset($U_START_FILTER)} 
-	<a href="{$U_START_FILTER}" title="{'display only recently posted images'|@translate}" rel="nofollow">
-	<img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
-{/if}
-{if isset($U_STOP_FILTER)}
-	<a href="{$U_STOP_FILTER}" title="{'return to the display of all images'|@translate}">	
-	<img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
-{/if}
 {if isset($tab_system) && $tab_system && in_array($id, $tab_closed)}
 <dt class="titre_acordeon">
@@ -12,5 +4,11 @@
 <dt class="titre_acordeon_0">
 {/if}
-	<a href="javascript:void(0);"><img src="{$ROOT_URL}{$themeconf.icon_dir}/menu/small_resizable.png" class="button_res" alt="[_]">{'Categories'|@translate}</a>
+  {if isset($U_START_FILTER)}
+  <a href="{$U_START_FILTER}" title="{'display only recently posted photos'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
+  {/if}
+  {if isset($U_STOP_FILTER)}
+  <a href="{$U_STOP_FILTER}" title="{'return to the display of all photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
+  {/if}
+	<a href="javascript:void(0);"><img src="{$ROOT_URL}{$themeconf.icon_dir}/menu/small_resizable.png" class="button_res" alt="[_]">{'Albums'|@translate}</a>
 </dt>
 <dd>
@@ -34,9 +32,5 @@
 {/foreach}
 {'</li></ul>'|@str_repeat:$ref_level}
-	{if isset($block->data.U_UPLOAD)}
-		<ul>
-			<li> <a href="{$block->data.U_UPLOAD}">{'Upload_picture'|@translate}</a> </li>
-		</ul>
-	{/if}
-	<p class="totalImages">{$pwg->l10n_dec('%d image', '%d images', $block->data.NB_PICTURE)}</p>
+
+	<p class="totalImages">{$pwg->l10n_dec('%d photo', '%d photos', $block->data.NB_PICTURE)}</p>
 </dd>
Index: /extensions/floOS/OS_default/template/menubar_identification.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_identification.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_identification.tpl	(revision 9675)
@@ -7,64 +7,64 @@
 <a href="javascript:void(0);"><img src="{$ROOT_URL}{$themeconf.icon_dir}/menu/small_resizable.png" class="button_res" alt="[_]">{'Identification'|@translate}</a></dt>
 <dd>
+{strip}
 	{if isset($USERNAME)}
-	<p>{'Hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
+	<p>{'Hello'|@translate} {$USERNAME} !</p>
 	{/if}
-
 	<ul>
 	{if isset($U_REGISTER)}
 	<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
 	{/if}
-
 	{if isset($U_LOGIN)}
 	<li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>
 	{/if}
-
 	{if isset($U_LOGOUT)}
 	<li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
 	{/if}
-
 	{if isset($U_PROFILE)}
-	<li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'Customize'|@translate}</a></li>
+	<li><a href="{$U_PROFILE}" title="{'customize the appareance of the gallery'|@translate}">{'Customize'|@translate}</a></li>
 	{/if}
-
 	{if isset($U_ADMIN)}
-	<li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'Administration'|@translate}</a></li>
+	<li><a href="{$U_ADMIN}" title="{'available for administrators only'|@translate}">{'Administration'|@translate}</a></li>
 	{/if}
 	</ul>
-
+{/strip}
 	{if isset($U_LOGIN)}
+{strip}
 	<form method="post" action="{$U_LOGIN}" id="quickconnect">
 	<fieldset>
 	<legend>{'Quick connect'|@translate}</legend>
 	<div>
-	<label for="username">{'Username'|@translate}</label><br/>
+	<label for="username">{'Username'|@translate}</label><br>
 	<input type="text" name="username" id="username" value="" style="width:99%">
 	</div>
 
-	<div><label for="password">{'Password'|@translate}</label>
-	<br/>
+	<div><label for="password">{'Password'|@translate}</label><br>
 	<input type="password" name="password" id="password" style="width:99%">
 	</div>
 
-{if $AUTHORIZE_REMEMBERING}
+	{if $AUTHORIZE_REMEMBERING}
 	<div><label for="remember_me">
-	{'Auto login'|@translate}
-	<input type="checkbox" name="remember_me" id="remember_me" value="1">
+	{'Auto login'|@translate} <input type="checkbox" name="remember_me" id="remember_me" value="1">
 	</label></div>
 	{/if}
 
 	<div>
-  <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}">
-	<input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
-	<ul class="actions">
-		<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
-		{if isset($U_REGISTER)}
-		<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
-		{/if}
-	</ul>
+	<input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}">
+	<input type="submit" name="login" value="{'Submit'|@translate}">
+	<span class="categoryActions">
+{if isset($U_REGISTER)}
+		<a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" class="pwg-state-default pwg-button">
+			<span class="pwg-icon pwg-icon-register"> </span>
+		</a>
+{/if}
+		<a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" class="pwg-state-default pwg-button">
+			<span class="pwg-icon pwg-icon-lost-password"> </span>
+		</a>
+	</span>
 	</div>
 
 	</fieldset>
 	</form>
+{/strip}
 	{/if}
 </dd>
Index: /extensions/floOS/OS_default/template/menubar_links.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_links.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_links.tpl	(revision 9675)
@@ -6,14 +6,12 @@
 <a href="javascript:void(0);"><img src="{$ROOT_URL}{$themeconf.icon_dir}/menu/small_resizable.png" class="button_res" alt="[_]">{'Links'|@translate}</a></dt>
 <dd>
-	<ul>
+	<ul>{strip}
 		{foreach from=$block->data item=link}
 			<li>
-				<a href="{$link.URL}" class="external" 
-					{if isset($link.new_window) } onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}
-				>
+				<a href="{$link.URL}" class="external"{if isset($link.new_window)} onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}>
 				{$link.LABEL}
 				</a>
 			</li>
 		{/foreach}
-	</ul>
+	{/strip}</ul>
 </dd>
Index: /extensions/floOS/OS_default/template/menubar_menu.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_menu.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_menu.tpl	(revision 9675)
@@ -7,12 +7,12 @@
     {/foreach}
       <li id="form_search_menu" >
-        {if isset($block->data.qsearch) and  $block->data.qsearch==true}
-    <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
-      <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
-        <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%">
-      </p>
-    </form>
-    <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
-  {/if}
+    {if isset($block->data.qsearch) and  $block->data.qsearch==true}
+      <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
+        <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
+          <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%">
+        </p>
+      </form>
+      <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+    {/if}
 	</li>
       <li id="home_icon" ><a href="{$myblock->data.U_CATEGORIES}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
Index: /extensions/floOS/OS_default/template/menubar_specials.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_specials.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_specials.tpl	(revision 9675)
@@ -7,8 +7,8 @@
 <a href="javascript:void(0);"><img src="{$ROOT_URL}{$themeconf.icon_dir}/menu/small_resizable.png" class="button_res" alt="[_]">{'Specials'|@translate}</a></dt>
 <dd>
-  <ul>
-    {foreach from=$block->data item=link}
-    <li><a href="{$link.URL}" title="{$link.TITLE}" {if isset($link.REL)}{$link.REL}{/if}>{$link.NAME}</a></li>
-    {/foreach}
-  </ul>
+	<ul>{strip}
+		{foreach from=$block->data item=link}
+		<li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li>
+		{/foreach}
+	{/strip}</ul>
 </dd>
Index: /extensions/floOS/OS_default/template/menubar_tags.tpl
===================================================================
--- /extensions/floOS/OS_default/template/menubar_tags.tpl	(revision 9674)
+++ /extensions/floOS/OS_default/template/menubar_tags.tpl	(revision 9675)
@@ -7,15 +7,12 @@
 	<div id="menuTagCloud">
 		{foreach from=$block->data item=tag}
-		<span>
-			<a class="tagLevel{$tag.level}"
+		<span>{strip}
+			<a class="tagLevel{$tag.level}" href=
 			{if isset($tag.U_ADD)}
-				href="{$tag.U_ADD}"
-				title="{$pwg->l10n_dec('%d image is also linked to current tags', '%d images are also linked to current tags', $tag.counter)}"
-				rel="nofollow">+
+				"{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+
 			{else}
-				href="{$tag.URL}"
-				title="{'See images linked to this tag only'|@translate}">
+				"{$tag.URL}" title="{'display photos linked to this tag'|@translate}">
 			{/if}
-				{$tag.name}</a></span>
+				{$tag.name}</a></span>{/strip}
 {* ABOVE there should be no space between text, </a> and </span> elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}
 		{/foreach}
Index: /extensions/floOS/OS_glass/index.php
===================================================================
--- /extensions/floOS/OS_glass/index.php	(revision 9675)
+++ /extensions/floOS/OS_glass/index.php	(revision 9675)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/floOS/OS_glass/template/picture.css
===================================================================
--- /extensions/floOS/OS_glass/template/picture.css	(revision 9674)
+++ 	(revision )
@@ -1,182 +1,0 @@
-/* $Id: picture.css 2295 2008-04-02 00:51:08Z rvelices $ */
-#imageHeaderBar {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	overflow: hidden;
-	width: 100%;
-	margin-top:0px;
-
-}
-
-#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: 50px;
-}
-#imageToolBar A, #imageToolBar IMG {
-    display: inline;
-    margin: 0; padding: 0;
-}
-#imageToolBar A {
-	margin-right: 3px;
-	margin-left: 5px;
-}
-#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;
-}
-
-/**               les miniatures */
-.thumbLink {
-height:45px;
-width:auto;
-}
-.navThumb {
-    margin-top: 2px;
-}
-#thumbPrev {
-    float: right;
-	margin-right:0px;
-}
-
-#thumbNext {
-    float: right;
-	margin-left:0px;
-}
-#thumbCurrent {
-    float: right;
-	border:1px solid #FF0000;
-}
-#linkPrev {
-    margin-right: 10px;
-    margin-left: 5px;
-}
-
-#linkNext {
-    margin-right: 5px;
-    margin-left: 10px;
-}
-#action_pict {
-/*	float:left;
-	position: absolute;
-	left: 5px;
-	top: 300px;
-    width:150px;*/
-	width:600px;
-	margin-left:auto;
-	margin-right:auto;
-	padding:0;
-}
-#action_pict A, #action_pict IMG{
-	border: none;
-	margin-right: 2px;
-	margin-left: 2px;	
-}
-
-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;
-}
-
-#rateForm {
-	display:block;
-	height:20px;
-	overflow:visible;
-}
-.rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty  {
-  padding:0;
-  border:0;
-  height:16px;
-  width:16px;
-}
-
-.rateButton, .rateButtonStarFull, .rateButtonStarEmpty {
-  cursor: pointer;
-}
-
-.rateButtonSelected {
-  font-weight:bold;
-  font-size:120%;
-}
-
-.rateButtonStarFull {
-	background: url('icon/rating-stars.gif') no-repeat scroll; background-position:-16px center; width:16px;
-}
-
-.rateButtonStarEmpty {
-	background: url('icon/rating-stars.gif') no-repeat scroll; background-position:0 center; width:16px;
-}
-
-#comments {
-	text-align: left;
-	margin:20px 30px 2em;
-}
-
-#comments .comment {
-  margin: 1em 0;
-}
-
-#comments P {
-  margin: 0 0.5em 0 1em;
-}
-
-#comments .author {
-  font-weight: bold;
-}
-
-#thePicturePage #comments BLOCKQUOTE {
-  margin: 0.5em 1em 1em 4em;
-}
-
-#comments P.userCommentDelete {
-  float: right;
-  margin: 0 0.5em 0 0;
-}
Index: /extensions/floOS/OS_glass/template/picture.tpl
===================================================================
--- /extensions/floOS/OS_glass/template/picture.tpl	(revision 9674)
+++ /extensions/floOS/OS_glass/template/picture.tpl	(revision 9675)
@@ -37,45 +37,58 @@
 <div id="imageToolBar">
   <div class="randomButtons">
-    {if isset($U_SLIDESHOW_START) }
-      <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"></a>
-    {/if}
-    {if isset($U_METADATA) }
-      <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
-    {/if}
-    {if isset($current.U_DOWNLOAD) }
-      <a href="{$current.U_DOWNLOAD}" title="{'download this file'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
-    {/if}
-    {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
-    {if isset($favorite) }
-      <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/{if $favorite.IS_FAVORITE}del_favorite{else}favorite{/if}.png" class="button" alt="favorite" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"></a>
-    {/if}
-    {if !empty($U_SET_AS_REPRESENTATIVE) }
-      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
-    {/if}
-    {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'Modify information'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
-    {/if}
-    {if isset($U_CADDIE) }{*caddie management BEGIN*}
-<script type="text/javascript">
+{strip}{if isset($U_SLIDESHOW_START)}
+	<a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_METADATA)}
+	<a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-camera-info"> </span><span class="pwg-button-text">{'Show file metadata'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($current.U_DOWNLOAD)}
+	<a href="{$current.U_DOWNLOAD}" title="{'download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-save"> </span><span class="pwg-button-text">{'download'|@translate}</span>
+	</a>
+{/if}{/strip}
+{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
+{strip}{if isset($favorite)}
+	<a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this photo from your favorites'|@translate}{else}{'add this photo to your favorites'|@translate}{/if}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}"> </span><span class="pwg-button-text">{'Favorites'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_SET_AS_REPRESENTATIVE)}
+	<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-representative"> </span><span class="pwg-button-text">{'representative'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_ADMIN)}
+	<a href="{$U_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'edit'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_CADDIE)}{*caddie management BEGIN*}
+{footer_script}
 {literal}function addToCadie(aElement, rootUrl, id)
 {
 if (aElement.disabled) return;
-aElement.disabled=true; 
+aElement.disabled=true;
 var y = new PwgWS(rootUrl);
-
 y.callService(
-  "pwg.caddie.add", {image_id: id} ,
-  {
-    onFailure: function(num, text) { alert(num + " " + text); document.location=aElement.href; },
-    onSuccess: function(result) { aElement.disabled = false; }
-  }
-  );
+	"pwg.caddie.add", {image_id: id} ,
+	{
+		onFailure: function(num, text) { alert(num + " " + text); document.location=aElement.href; },
+		onSuccess: function(result) { aElement.disabled = false; }
+	}
+	);
 }{/literal}
-</script>
-      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
-    {/if}{*caddie management END*}
+{/footer_script}
+	<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL}', {$current.id}); return false;" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span>
+	</a>
+{/if}{/strip}{*caddie management END*}
   </div>
   {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
-</div> <!-- imageToolBar -->
+</div>{*<!-- imageToolBar -->*}
 
 <div id="theImage">
@@ -142,6 +155,7 @@
 </div>
 
-<table id="standard" class="infoTable" summary="{'Some info about this picture'|@translate}">
-  {if $display_info.author}
+<table id="standard" class="infoTable">
+{strip}
+ {if $display_info.author}
   <tr id="Author">
     <td class="label">{'Author'|@translate}</td>
@@ -228,23 +242,25 @@
 	<tr id="rating">
 		<td class="label">
-			<span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
+			<span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this photo'|@translate}{/if}</span>
 		</td>
 		<td class="value">
 			<form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
-			<div>&nbsp;
+			<div>
 			{foreach from=$rating.marks item=mark name=rate_loop}
-			{if !$smarty.foreach.rate_loop.first} | {/if}
 			{if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
-			  <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
+				<input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
 			{else}
-			  <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
+				<input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
 			{/if}
 			{/foreach}
-			<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
-			<script type="text/javascript">
-			makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
-			updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
-			ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
-			</script>
+			{strip}{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+			{combine_script id='rating' load='async' require='core.scripts' path='themes/default/js/rating.js'}
+			{footer_script}
+				var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
+				_pwgRatingAutoQueue.push( {ldelim}rootUrl: '{$ROOT_URL}', image_id: {$current.id},
+					updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
+					ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary"){rdelim} );
+			{/footer_script}
+			{/strip}
 			</div>
 			</form>
@@ -253,9 +269,10 @@
 {/if}
 
-{if $display_info.privacy_level and isset($available_permission_levels) }
+{if $display_info.privacy_level and isset($available_permission_levels)}
 	<tr id="Privacy">
 		<td class="label">{'Who can see this photo?'|@translate}</td>
-		<td class="value"> 
-<script type="text/javascript">
+		<td class="value">
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+{footer_script}
 {literal}function setPrivacyLevel(selectElement, rootUrl, id, level)
 {
@@ -271,6 +288,6 @@
 	);
 }{/literal}
-</script>
-	<select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
+{/footer_script}
+	<select onchange="setPrivacyLevel(this, '{$ROOT_URL}', {$current.id}, this.options[selectedIndex].value)">
 		{foreach from=$available_permission_levels item=label key=level}
 		<option label="{$label}" value="{$level}"{if $level == $current.level} selected="selected"{/if}>{$label}</option>
@@ -279,5 +296,5 @@
 	</td></tr>
 {/if}
-
+{/strip}
 </table>
 
Index: /extensions/floOS/OS_glass/template/picture_nav_buttons.tpl
===================================================================
--- /extensions/floOS/OS_glass/template/picture_nav_buttons.tpl	(revision 9674)
+++ /extensions/floOS/OS_glass/template/picture_nav_buttons.tpl	(revision 9675)
@@ -1,15 +1,22 @@
   <div class="navButtons">
   
-{if isset($last)}
-  <a class="navButton prev" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a>
+{strip}{if isset($last)}
+	<a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
-{/if}
-  
-{if isset($next)}
-  <a class="navButton next" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'Next'|@translate}"></a>
+	<span class="pwg-state-disabled pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrowstop-e">&nbsp;</span><span class="pwg-button-text">{'Last'|@translate}</span>
+	</span>
+{/if}{/strip}
+{strip}{if isset($next)}
+	<a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
+	</span>
+{/if}{/strip}
 {if isset($next) }
 <a class="navThumb" id="thumbNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
@@ -17,5 +24,5 @@
 </a>
 {/if}
-    <img src="{$current.THUMB_SRC}" class="thumbLink" id="thumbCurrent" alt="{$ALT_IMG}">
+	<img src="{$current.THUMB_SRC}" class="thumbLink" id="thumbCurrent" alt="{$ALT_IMG}">
 {if isset($previous) }
 <a class="navThumb" id="thumbPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
@@ -25,89 +32,107 @@
 
 {if isset($slideshow.U_START_PLAY)}
-  <a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'Play of slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-play">&nbsp;</span><span class="pwg-button-text">{'Play of slideshow'|@translate}</span>
+	</a>
 {/if}
-
 {if isset($slideshow.U_STOP_PLAY)}
-  <a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'Pause of slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-pause">&nbsp;</span><span class="pwg-button-text">{'Pause of slideshow'|@translate}</span>
+	</a>
 {/if}
 
   
-{if isset($previous)}
-  <a class="navButton prev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'Previous'|@translate}"></a>
+{strip}{if isset($previous)}
+	<a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
+	</span>
+{/if}{/strip}
   
-{if isset($first)}
-  <a class="navButton prev" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'First'|@translate}"></a>
+{strip}{if isset($first)}
+	<a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
+	</span>
+{/if}{/strip}
 
 
 {if isset($slideshow.U_START_REPEAT)}
-  <a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'Repeat the slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-repeat-play">&nbsp;</span><span class="pwg-button-text">{'Repeat the slideshow'|@translate}</span>
+	</a>
 {/if}
-
 {if isset($slideshow.U_STOP_REPEAT)}
-  <a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'Not repeat the slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-repeat-stop">&nbsp;</span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span>
+	</a>
 {/if}
 
 {if isset($slideshow)}
-  {if isset($slideshow.U_DEC_PERIOD)}
-    <a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'Accelerate diaporama speed'|@translate}"></a>
-  {else}
-    <a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
-  {/if}
-
-  {if isset($slideshow.U_INC_PERIOD)}
-    <a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'Reduce diaporama speed'|@translate}"></a>
-  {else}
-    <a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
-  {/if}
+{if isset($slideshow.U_INC_PERIOD)}
+	<a href="{$slideshow.U_INC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-clock-minus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</a>
+{else}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-clock-minus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</span>
+{/if}
+{if isset($slideshow.U_DEC_PERIOD)}
+	<a href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-clock-plus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</a>
+{else}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-clock-plus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</span>
+{/if}
+{/if}
+{strip}{if isset($U_UP) and !isset($slideshow)}
+	<a href="{$U_UP}" title="{'Thumbnails'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-n">&nbsp;</span><span class="pwg-button-text">{'Thumbnails'|@translate}</span>
+	</a>
+{/if}{/strip}
+</div>
+{strip}
+{footer_script}
+document.onkeydown = function(e){ldelim}
+	e=e||window.event;
+	if (e.altKey) return true;
+	var target=e.target||e.srcElement;
+	if (target && target.type) return true;{* an input editable element *}
+	var keyCode=e.keyCode||e.which, docElem=document.documentElement, url;
+	switch(keyCode){ldelim}
+{if isset($next)}
+	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG}"; break;
+{/if}
+{if isset($previous)}
+	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG}"; break;
+{/if}
+{if isset($first)}
+	{* Home *}case 36: if (e.ctrlKey)url="{$first.U_IMG}"; break;
+{/if}
+{if isset($last)}
+	{* End *}case 35: if (e.ctrlKey)url="{$last.U_IMG}"; break;
 {/if}
 {if isset($U_UP) and !isset($slideshow)}
-  <a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+	{* Up *}case 38: if (e.ctrlKey)url="{$U_UP}"; break;
 {/if}
-
-  </div>
-
-<script type="text/javascript">// <![CDATA[
-{literal}
-function keyboardNavigation(e)
-{
-	if(!e) e=window.event;
-	if (e.altKey) return true;
-	var target = e.target || e.srcElement;
-	if (target && target.type) return true; //an input editable element
-	var keyCode=e.keyCode || e.which;
-	var docElem = document.documentElement;
-	switch(keyCode) {
-{/literal}
-{if isset($next)}
-	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
-{/if}
-{if isset($previous)}
-	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($first)}
-	/*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($last)}
-	/*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($U_UP) and !isset($slideshow)}
-	/*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-
 {if isset($slideshow.U_START_PLAY)}
-	/*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+	{* Pause *}case 32: url="{$slideshow.U_START_PLAY}"; break;
 {/if}
 {if isset($slideshow.U_STOP_PLAY)}
-	/*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+	{* Play *}case 32: url="{$slideshow.U_STOP_PLAY}"; break;
 {/if}
 	}
+	if (url) {ldelim}window.location=url.replace("&amp;","&"); return false;}
 	return true;
 }
-document.onkeydown=keyboardNavigation;
-// ]]></script>
+{/footer_script}
+{/strip}
Index: /extensions/floOS/OS_glass/theme.css
===================================================================
--- /extensions/floOS/OS_glass/theme.css	(revision 9674)
+++ /extensions/floOS/OS_glass/theme.css	(revision 9675)
@@ -1,9 +1,8 @@
 /* ---------------------------------------------------------------------------
-Thème glass 
-
-pour le template floOS
-
-by flop25
-
+Thème OS_glass 
+
+theme-enfant de OS_default
+
+by flop25 http://www.planete-flop.fr/
 ------------------------------------------------------------------------------ */
 
Index: /extensions/floOS/OS_glass/themeconf.inc.php
===================================================================
--- /extensions/floOS/OS_glass/themeconf.inc.php	(revision 9674)
+++ /extensions/floOS/OS_glass/themeconf.inc.php	(revision 9675)
@@ -2,9 +2,9 @@
 /*
 Theme Name: OS_glass
-Version: 1.0.0
+Version: auto
 Description: 
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=498
 Author: flop25
-Author URI: http://www.planete-flop.fr/site.php?acc=file
+Author URI: http://www.planete-flop.fr
 */
 
@@ -21,15 +21,18 @@
 	'tab_closed'			=> array('mbLinks','mbTags','mbSpecials','mbIdentification'),	# tabs which are closed when the page is loaded
 );
-@include('themeconf_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/OS_glass.inc.php');
+if (isset($conf['local_dir_site']))
+{
+  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/OS_glass.inc.php');
+}
 
-	add_event_handler('init', 'dynamic_tab', 20);
-
-	function  dynamic_tab() {
-global $template, $conf;
-$template->assign(
-  array(
-    'tab_system' => get_themeconf('tab_system'),
-    'tab_closed' => get_themeconf('tab_closed'),
-    ));
-	}
+add_event_handler('init', 'dynamic_tab', 20);
+function  dynamic_tab() {
+	global $template, $conf;
+	$template->assign(
+		array(
+			'tab_system' => get_themeconf('tab_system'),
+			'tab_closed' => get_themeconf('tab_closed'),
+			));
+}
 ?>
Index: /extensions/floOS/OS_glass_clear/index.php
===================================================================
--- /extensions/floOS/OS_glass_clear/index.php	(revision 9675)
+++ /extensions/floOS/OS_glass_clear/index.php	(revision 9675)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: tensions/floOS/OS_glass_clear/template/picture.css
===================================================================
--- /extensions/floOS/OS_glass_clear/template/picture.css	(revision 9674)
+++ 	(revision )
@@ -1,182 +1,0 @@
-/* $Id: picture.css 2295 2008-04-02 00:51:08Z rvelices $ */
-#imageHeaderBar {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	overflow: hidden;
-	width: 100%;
-	margin-top:0px;
-
-}
-
-#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: 50px;
-}
-#imageToolBar A, #imageToolBar IMG {
-    display: inline;
-    margin: 0; padding: 0;
-}
-#imageToolBar A {
-	margin-right: 3px;
-	margin-left: 5px;
-}
-#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;
-}
-
-/**               les miniatures */
-.thumbLink {
-height:45px;
-width:auto;
-}
-.navThumb {
-    margin-top: 2px;
-}
-#thumbPrev {
-    float: right;
-	margin-right:0px;
-}
-
-#thumbNext {
-    float: right;
-	margin-left:0px;
-}
-#thumbCurrent {
-    float: right;
-	border:1px solid #FF0000;
-}
-#linkPrev {
-    margin-right: 10px;
-    margin-left: 5px;
-}
-
-#linkNext {
-    margin-right: 5px;
-    margin-left: 10px;
-}
-#action_pict {
-/*	float:left;
-	position: absolute;
-	left: 5px;
-	top: 300px;
-    width:150px;*/
-	width:600px;
-	margin-left:auto;
-	margin-right:auto;
-	padding:0;
-}
-#action_pict A, #action_pict IMG{
-	border: none;
-	margin-right: 2px;
-	margin-left: 2px;	
-}
-
-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;
-}
-
-#rateForm {
-	display:block;
-	height:20px;
-	overflow:visible;
-}
-.rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty  {
-  padding:0;
-  border:0;
-  height:16px;
-  width:16px;
-}
-
-.rateButton, .rateButtonStarFull, .rateButtonStarEmpty {
-  cursor: pointer;
-}
-
-.rateButtonSelected {
-  font-weight:bold;
-  font-size:120%;
-}
-
-.rateButtonStarFull {
-	background: url('icon/rating-stars.gif') no-repeat scroll; background-position:-16px center; width:16px;
-}
-
-.rateButtonStarEmpty {
-	background: url('icon/rating-stars.gif') no-repeat scroll; background-position:0 center; width:16px;
-}
-
-#comments {
-	text-align: left;
-	margin:20px 30px 2em;
-}
-
-#comments .comment {
-  margin: 1em 0;
-}
-
-#comments P {
-  margin: 0 0.5em 0 1em;
-}
-
-#comments .author {
-  font-weight: bold;
-}
-
-#thePicturePage #comments BLOCKQUOTE {
-  margin: 0.5em 1em 1em 4em;
-}
-
-#comments P.userCommentDelete {
-  float: right;
-  margin: 0 0.5em 0 0;
-}
Index: /extensions/floOS/OS_glass_clear/template/picture.tpl
===================================================================
--- /extensions/floOS/OS_glass_clear/template/picture.tpl	(revision 9674)
+++ /extensions/floOS/OS_glass_clear/template/picture.tpl	(revision 9675)
@@ -37,45 +37,58 @@
 <div id="imageToolBar">
   <div class="randomButtons">
-    {if isset($U_SLIDESHOW_START) }
-      <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"></a>
-    {/if}
-    {if isset($U_METADATA) }
-      <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
-    {/if}
-    {if isset($current.U_DOWNLOAD) }
-      <a href="{$current.U_DOWNLOAD}" title="{'download this file'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
-    {/if}
-    {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
-    {if isset($favorite) }
-      <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/{if $favorite.IS_FAVORITE}del_favorite{else}favorite{/if}.png" class="button" alt="favorite" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"></a>
-    {/if}
-    {if !empty($U_SET_AS_REPRESENTATIVE) }
-      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
-    {/if}
-    {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'Modify information'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
-    {/if}
-    {if isset($U_CADDIE) }{*caddie management BEGIN*}
-<script type="text/javascript">
+{strip}{if isset($U_SLIDESHOW_START)}
+	<a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_METADATA)}
+	<a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-camera-info"> </span><span class="pwg-button-text">{'Show file metadata'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($current.U_DOWNLOAD)}
+	<a href="{$current.U_DOWNLOAD}" title="{'download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-save"> </span><span class="pwg-button-text">{'download'|@translate}</span>
+	</a>
+{/if}{/strip}
+{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
+{strip}{if isset($favorite)}
+	<a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this photo from your favorites'|@translate}{else}{'add this photo to your favorites'|@translate}{/if}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}"> </span><span class="pwg-button-text">{'Favorites'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_SET_AS_REPRESENTATIVE)}
+	<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-representative"> </span><span class="pwg-button-text">{'representative'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_ADMIN)}
+	<a href="{$U_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'edit'|@translate}</span>
+	</a>
+{/if}{/strip}
+{strip}{if isset($U_CADDIE)}{*caddie management BEGIN*}
+{footer_script}
 {literal}function addToCadie(aElement, rootUrl, id)
 {
 if (aElement.disabled) return;
-aElement.disabled=true; 
+aElement.disabled=true;
 var y = new PwgWS(rootUrl);
-
 y.callService(
-  "pwg.caddie.add", {image_id: id} ,
-  {
-    onFailure: function(num, text) { alert(num + " " + text); document.location=aElement.href; },
-    onSuccess: function(result) { aElement.disabled = false; }
-  }
-  );
+	"pwg.caddie.add", {image_id: id} ,
+	{
+		onFailure: function(num, text) { alert(num + " " + text); document.location=aElement.href; },
+		onSuccess: function(result) { aElement.disabled = false; }
+	}
+	);
 }{/literal}
-</script>
-      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
-    {/if}{*caddie management END*}
+{/footer_script}
+	<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL}', {$current.id}); return false;" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span>
+	</a>
+{/if}{/strip}{*caddie management END*}
   </div>
   {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
-</div> <!-- imageToolBar -->
+</div>{*<!-- imageToolBar -->*}
 
 <div id="theImage">
@@ -142,6 +155,7 @@
 </div>
 
-<table id="standard" class="infoTable" summary="{'Some info about this picture'|@translate}">
-  {if $display_info.author}
+<table id="standard" class="infoTable">
+{strip}
+ {if $display_info.author}
   <tr id="Author">
     <td class="label">{'Author'|@translate}</td>
@@ -228,23 +242,25 @@
 	<tr id="rating">
 		<td class="label">
-			<span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
+			<span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this photo'|@translate}{/if}</span>
 		</td>
 		<td class="value">
 			<form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
-			<div>&nbsp;
+			<div>
 			{foreach from=$rating.marks item=mark name=rate_loop}
-			{if !$smarty.foreach.rate_loop.first} | {/if}
 			{if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
-			  <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
+				<input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
 			{else}
-			  <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
+				<input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
 			{/if}
 			{/foreach}
-			<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
-			<script type="text/javascript">
-			makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
-			updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
-			ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
-			</script>
+			{strip}{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+			{combine_script id='rating' load='async' require='core.scripts' path='themes/default/js/rating.js'}
+			{footer_script}
+				var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
+				_pwgRatingAutoQueue.push( {ldelim}rootUrl: '{$ROOT_URL}', image_id: {$current.id},
+					updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
+					ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary"){rdelim} );
+			{/footer_script}
+			{/strip}
 			</div>
 			</form>
@@ -253,9 +269,10 @@
 {/if}
 
-{if $display_info.privacy_level and isset($available_permission_levels) }
+{if $display_info.privacy_level and isset($available_permission_levels)}
 	<tr id="Privacy">
 		<td class="label">{'Who can see this photo?'|@translate}</td>
-		<td class="value"> 
-<script type="text/javascript">
+		<td class="value">
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+{footer_script}
 {literal}function setPrivacyLevel(selectElement, rootUrl, id, level)
 {
@@ -271,6 +288,6 @@
 	);
 }{/literal}
-</script>
-	<select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
+{/footer_script}
+	<select onchange="setPrivacyLevel(this, '{$ROOT_URL}', {$current.id}, this.options[selectedIndex].value)">
 		{foreach from=$available_permission_levels item=label key=level}
 		<option label="{$label}" value="{$level}"{if $level == $current.level} selected="selected"{/if}>{$label}</option>
@@ -279,5 +296,5 @@
 	</td></tr>
 {/if}
-
+{/strip}
 </table>
 
Index: /extensions/floOS/OS_glass_clear/template/picture_nav_buttons.tpl
===================================================================
--- /extensions/floOS/OS_glass_clear/template/picture_nav_buttons.tpl	(revision 9674)
+++ /extensions/floOS/OS_glass_clear/template/picture_nav_buttons.tpl	(revision 9675)
@@ -1,15 +1,22 @@
   <div class="navButtons">
   
-{if isset($last)}
-  <a class="navButton prev" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a>
+{strip}{if isset($last)}
+	<a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
-{/if}
-  
-{if isset($next)}
-  <a class="navButton next" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'Next'|@translate}"></a>
+	<span class="pwg-state-disabled pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrowstop-e">&nbsp;</span><span class="pwg-button-text">{'Last'|@translate}</span>
+	</span>
+{/if}{/strip}
+{strip}{if isset($next)}
+	<a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button pwg-button-icon-right">
+		<span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
+	</span>
+{/if}{/strip}
 {if isset($next) }
 <a class="navThumb" id="thumbNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
@@ -17,5 +24,5 @@
 </a>
 {/if}
-    <img src="{$current.THUMB_SRC}" class="thumbLink" id="thumbCurrent" alt="{$ALT_IMG}">
+	<img src="{$current.THUMB_SRC}" class="thumbLink" id="thumbCurrent" alt="{$ALT_IMG}">
 {if isset($previous) }
 <a class="navThumb" id="thumbPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
@@ -25,89 +32,107 @@
 
 {if isset($slideshow.U_START_PLAY)}
-  <a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'Play of slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-play">&nbsp;</span><span class="pwg-button-text">{'Play of slideshow'|@translate}</span>
+	</a>
 {/if}
-
 {if isset($slideshow.U_STOP_PLAY)}
-  <a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'Pause of slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-pause">&nbsp;</span><span class="pwg-button-text">{'Pause of slideshow'|@translate}</span>
+	</a>
 {/if}
 
   
-{if isset($previous)}
-  <a class="navButton prev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'Previous'|@translate}"></a>
+{strip}{if isset($previous)}
+	<a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
+	</span>
+{/if}{/strip}
   
-{if isset($first)}
-  <a class="navButton prev" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'First'|@translate}"></a>
+{strip}{if isset($first)}
+	<a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
+	</a>
 {else}
-  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
-{/if}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
+	</span>
+{/if}{/strip}
 
 
 {if isset($slideshow.U_START_REPEAT)}
-  <a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'Repeat the slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-repeat-play">&nbsp;</span><span class="pwg-button-text">{'Repeat the slideshow'|@translate}</span>
+	</a>
 {/if}
-
 {if isset($slideshow.U_STOP_REPEAT)}
-  <a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'Not repeat the slideshow'|@translate}"></a>
+	<a href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-repeat-stop">&nbsp;</span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span>
+	</a>
 {/if}
 
 {if isset($slideshow)}
-  {if isset($slideshow.U_DEC_PERIOD)}
-    <a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'Accelerate diaporama speed'|@translate}"></a>
-  {else}
-    <a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
-  {/if}
-
-  {if isset($slideshow.U_INC_PERIOD)}
-    <a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'Reduce diaporama speed'|@translate}"></a>
-  {else}
-    <a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
-  {/if}
+{if isset($slideshow.U_INC_PERIOD)}
+	<a href="{$slideshow.U_INC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-clock-minus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</a>
+{else}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-clock-minus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</span>
+{/if}
+{if isset($slideshow.U_DEC_PERIOD)}
+	<a href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-clock-plus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</a>
+{else}
+	<span class="pwg-state-disabled pwg-button">
+		<span class="pwg-icon pwg-icon-clock-plus">&nbsp;</span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span>
+	</span>
+{/if}
+{/if}
+{strip}{if isset($U_UP) and !isset($slideshow)}
+	<a href="{$U_UP}" title="{'Thumbnails'|@translate}" class="pwg-state-default pwg-button">
+		<span class="pwg-icon pwg-icon-arrow-n">&nbsp;</span><span class="pwg-button-text">{'Thumbnails'|@translate}</span>
+	</a>
+{/if}{/strip}
+</div>
+{strip}
+{footer_script}
+document.onkeydown = function(e){ldelim}
+	e=e||window.event;
+	if (e.altKey) return true;
+	var target=e.target||e.srcElement;
+	if (target && target.type) return true;{* an input editable element *}
+	var keyCode=e.keyCode||e.which, docElem=document.documentElement, url;
+	switch(keyCode){ldelim}
+{if isset($next)}
+	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG}"; break;
+{/if}
+{if isset($previous)}
+	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG}"; break;
+{/if}
+{if isset($first)}
+	{* Home *}case 36: if (e.ctrlKey)url="{$first.U_IMG}"; break;
+{/if}
+{if isset($last)}
+	{* End *}case 35: if (e.ctrlKey)url="{$last.U_IMG}"; break;
 {/if}
 {if isset($U_UP) and !isset($slideshow)}
-  <a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+	{* Up *}case 38: if (e.ctrlKey)url="{$U_UP}"; break;
 {/if}
-
-  </div>
-
-<script type="text/javascript">// <![CDATA[
-{literal}
-function keyboardNavigation(e)
-{
-	if(!e) e=window.event;
-	if (e.altKey) return true;
-	var target = e.target || e.srcElement;
-	if (target && target.type) return true; //an input editable element
-	var keyCode=e.keyCode || e.which;
-	var docElem = document.documentElement;
-	switch(keyCode) {
-{/literal}
-{if isset($next)}
-	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
-{/if}
-{if isset($previous)}
-	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($first)}
-	/*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($last)}
-	/*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-{if isset($U_UP) and !isset($slideshow)}
-	/*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
-{/if}
-
 {if isset($slideshow.U_START_PLAY)}
-	/*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+	{* Pause *}case 32: url="{$slideshow.U_START_PLAY}"; break;
 {/if}
 {if isset($slideshow.U_STOP_PLAY)}
-	/*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+	{* Play *}case 32: url="{$slideshow.U_STOP_PLAY}"; break;
 {/if}
 	}
+	if (url) {ldelim}window.location=url.replace("&amp;","&"); return false;}
 	return true;
 }
-document.onkeydown=keyboardNavigation;
-// ]]></script>
+{/footer_script}
+{/strip}
Index: /extensions/floOS/OS_glass_clear/theme.css
===================================================================
--- /extensions/floOS/OS_glass_clear/theme.css	(revision 9674)
+++ /extensions/floOS/OS_glass_clear/theme.css	(revision 9675)
@@ -281,5 +281,5 @@
 	background-position: center bottom;
 	background-color: #000000;
-}
+}/*
 #imageToolBar A:hover {
 background-image: url(images/fondMenuSurvol.gif);
@@ -287,5 +287,5 @@
 background-position:center;
 background-color:transparent;
-}
+}*/
 #action_pict {
 	border: 2px solid #FFFFFF;
@@ -293,4 +293,23 @@
     color:#000;
     font-weight:bold;
+}
+#imageToolBar {
+    height: 60px;
+}
+#imageToolBar #thumbPrev, #imageToolBar #thumbNext {
+	margin-left:5px;
+	margin-right:5px;
+	display:inline;
+	width:auto;
+}
+#imageToolBar #thumbCurrent {
+	margin-left:5px;
+	margin-right:5px;
+	display:inline;
+	width:auto;
+}
+#imageToolBar #linkPrev, #imageToolBar #thumbCurrent, #imageToolBar #linkNext {
+	border:#FFF solid 2px;
+	width:auto;
 }
 /*calendar elements*/
Index: /extensions/floOS/OS_glass_clear/themeconf.inc.php
===================================================================
--- /extensions/floOS/OS_glass_clear/themeconf.inc.php	(revision 9674)
+++ /extensions/floOS/OS_glass_clear/themeconf.inc.php	(revision 9675)
@@ -1,8 +1,8 @@
 <?php
 /*
-Theme Name: OS_glass
+Theme Name: OS_glass_clear
 Version: auto
 Description: 
-Theme URI: http://fr.piwigo.org/ext/extension_view.php?eid=383
+Theme URI: http://piwigo.org/ext/extension_view.php?eid=514
 Author: flop25
 Author URI: http://www.planete-flop.fr
Index: /extensions/floOS/OS_glass_dark/themeconf.inc.php
===================================================================
--- /extensions/floOS/OS_glass_dark/themeconf.inc.php	(revision 9674)
+++ /extensions/floOS/OS_glass_dark/themeconf.inc.php	(revision 9675)
@@ -1,8 +1,8 @@
 <?php
 /*
-Theme Name: OS_glass_clear
+Theme Name: OS_glass_dark
 Version: auto
 Description: 
-Theme URI: http://piwigo.org/ext/extension_view.php?eid=514
+Theme URI: http://piwigo.org/ext/extension_view.php?eid=515
 Author: flop25
 Author URI: http://www.planete-flop.fr
@@ -10,5 +10,5 @@
 
 $themeconf = array(
-  'name'         => 'OS_glass_clear',
+  'name'         => 'OS_glass_dark',
   'parent'        => 'OS_default',
   'icon_dir'      => 'themes/OS_default/icon',
@@ -21,8 +21,8 @@
 	'tab_closed'			=> array('mbLinks','mbTags','mbSpecials','mbIdentification'),	# tabs which are closed when the page is loaded
 );
-@include(PHPWG_ROOT_PATH. 'local/config/OS_glass_clear.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/OS_glass_dark.inc.php');
 if (isset($conf['local_dir_site']))
 {
-  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/OS_glass_clear.inc.php');
+  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/OS_glass_dark.inc.php');
 }
 
