Changeset 13551

Timestamp:

Mar 14, 2012, 2:37:30 PM (12 years ago)

Author:

plg

Message:

import theme Simple version 2.4

compatibility with piwigo 2.2:

• update template, language strings + misc things
• use rating and core.scripts from default theme
• cleanup useless javascript stuff
• use new combined_css feature - thanks to P@t
• replace known_script with combine_script

Location:

extensions/simple_themes/simple

Files:

• README.md (modified) (1 diff)
• index.php (modified) (1 diff)
• js/compress.sh (deleted)
• js/jquery-1.4.4.min.js (deleted)
• js/pwgscripts.js (deleted)
• js/rating.js (deleted)
• js/scripts.js (modified) (1 diff)
• js/scripts.min.js (deleted)
• js/simplescripts.js (deleted)
• template/about.tpl (modified) (2 diffs)
• template/comments.tpl (modified) (1 diff)
• template/header.tpl (modified) (2 diffs)
• template/identification.tpl (modified) (1 diff)
• template/mainpage_categories.tpl (modified) (1 diff)
• template/menubar.tpl (modified) (2 diffs)
• template/menubar_categories.tpl (modified) (2 diffs)
• template/menubar_tags.tpl (modified) (1 diff)
• template/nbm.tpl (modified) (1 diff)
• template/notification.tpl (modified) (2 diffs)
• template/password.tpl (modified) (1 diff)
• template/picture.tpl (modified) (1 diff)
• template/picture_content.tpl (modified) (2 diffs)
• template/profile.tpl (modified) (1 diff)
• template/register.tpl (modified) (2 diffs)
• template/search.tpl (modified) (2 diffs)
• template/search_rules.tpl (modified) (1 diff)
• template/tags.tpl (modified) (3 diffs)
• template/upload.tpl (modified) (2 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/simple_themes/simple/README.md

@@ -40 +40 @@
   extract it in ``your-gallery/template/``.
 
-Notes for developpers
----------------------
-
-* `js/compress.sh` is a script which allows to compress and minify the
-  different javascript files, using `yuicompressor`.
-
 Changelog
 ---------
+
+### version 2.4 (05/04/2011)
+
+compatibility with piwigo 2.2:
+* update template, language strings + misc things
+* use rating and core.scripts from default theme
+* cleanup useless javascript stuff
+* use new combined_css feature - thanks to P@t
+* replace known_script with combine_script
 
 ### version 2.3 (07/01/2011)

extensions/simple_themes/simple/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | 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 |

extensions/simple_themes/simple/js/scripts.js

@@ -30 +30 @@
   };
 });
-function SelectAll( formulaire )
-{
-var elts = formulaire.elements;
-for(var i=0; i <elts.length; i++)
-{
-        if (elts[i].type=='checkbox')
-                elts[i].checked = true;
-}
-}
-
-function DeselectAll( formulaire )
-{
-var elts = formulaire.elements;
-for(var i=0; i <elts.length; i++)
-{
-        if (elts[i].type=='checkbox')
-                elts[i].checked = false;
-}
-}
-
-function Inverser( formulaire )
-{
-var elts = formulaire.elements;
-for(var i=0; i <elts.length; i++)
-{
-        if (elts[i].type=='checkbox')
-                elts[i].checked = !elts[i].checked;
-}
-}
-
-function phpWGOpenWindow(theURL,winName,features)
-{
-        img = new Image();
-        img.src = theURL;
-        if (img.complete)
-        {
-                var width=img.width+40, height=img.height+40;
-        }
-        else
-        {
-                var width=640, height=480;
-                img.onload = function () { newWin.resizeTo( img.width+50, img.height+100); };
-        }
-        newWin = window.open(theURL,winName,features+',left=2,top=1,width=' + width + ',height=' + height);
-}
-
-function popuphelp(url)
-{
-        window.open( url, 'dc_popup',
-                'alwaysRaised=yes,dependent=yes,toolbar=no,height=420,width=500,menubar=no,resizable=yes,scrollbars=yes,status=no'
-        );
-}
-
-Function.prototype.pwgBind = function() {
-                var __method = this, object = arguments[0], args = Array.prototype.slice.call(arguments,1);
-                return function() {
-                                return __method.apply(object, args.concat(arguments) );
-                }
-}
-function PwgWS(urlRoot)
-{
-        this.urlRoot = urlRoot;
-        this.options = {
-                method: "GET",
-                async:  true,
-                onFailure: null,
-                onSuccess: null
-        };
-};
-
-PwgWS.prototype = {
-
-        callService : function(method, parameters, options)
-        {
-                if (options)
-                {
-                        for (var property in options)
-                                this.options[property] = options[property];
-                }
-                try { this.transport = new XMLHttpRequest();}
-                catch(e) {
-                        try { this.transport = new ActiveXObject('Msxml2.XMLHTTP'); }
-                        catch(e) {
-                                try { this.transport = new ActiveXObject('Microsoft.XMLHTTP'); }
-                                catch (e){
-                                        dispatchError(0, "Cannot create request object");
-                                }
-                        }
-                }
-                this.transport.onreadystatechange = this.onStateChange.pwgBind(this);
-
-                var url = this.urlRoot+"ws.php?format=json";
-
-                var body = "method="+method;
-                if (parameters)
-                {
-                        for (var property in parameters)
-                        {
-                                if ( typeof parameters[property] == 'object' && parameters[property])
-                                {
-                                        for (var i=0; i<parameters[property].length; i++)
-                                                body += "&"+property+"[]="+encodeURIComponent(parameters[property][i]);
-                                }
-                                else
-                                        body += "&"+property+"="+encodeURIComponent(parameters[property]);
-                        }
-                }
-
-                if (this.options.method == "POST" )
-                {
-                        this.transport.open(this.options.method, url, this.options.async);
-                        this.transport.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-                        this.transport.send(body);
-                }
-                else
-                {
-                        url += "&"+body;
-                        this.transport.open(this.options.method, url, this.options.async);
-                        this.transport.send(null);
-                }
-        },
-
-        onStateChange: function() {
-                var readyState = this.transport.readyState;
-                if (readyState==4)
-                        this.respondToReadyState(readyState);
-        },
-
-        dispatchError: function( httpCode, text )
-        {
-                !this.options.onFailure || this.options.onFailure( httpCode, text);
-        },
-
-        respondToReadyState: function(readyState)
-        {
-                var transport = this.transport;
-                if (readyState==4 && transport.status == 200)
-                {
-                        var resp;
-                        try {
-                                eval('resp = ' + transport.responseText);
-                        }
-                        catch (e) {
-                                this.dispatchError( 200, e.message + '\n' + transport.responseText.substr(0,512) );
-                        }
-                        if (resp!=null)
-                        {
-                                if (resp.stat==null)
-                                        this.dispatchError( 200, "Invalid response" );
-                                else if (resp.stat=='ok')
-                                {
-                                        if (this.options.onSuccess) this.options.onSuccess( resp.result );
-                                }
-                                else
-                                        this.dispatchError( 200, resp.err + " " + resp.message);
-                        }
-                }
-                if (readyState==4 && transport.status != 200)
-                        this.dispatchError( transport.status, transport.statusText );
-        },
-
-
-        transport: null,
-        urlRoot: null,
-        options: {}
-}
-
-function pwgAddEventListener(elem, evt, fn)
-{
-        if (window.attachEvent)
-                elem.attachEvent('on'+evt, fn);
-        else
-                elem.addEventListener(evt, fn, false);
-}var gRatingOptions, gRatingButtons, gUserRating;
-
-function makeNiceRatingForm(options)
-{
-        gRatingOptions = options || {};
-        var form = document.getElementById('rateForm');
-        if (!form) return; //? template changed
-
-        gRatingButtons = form.getElementsByTagName('input');
-        gUserRating = "";
-        for (var i=0; i<gRatingButtons.length; i++)
-        {
-                if ( gRatingButtons[i].type=="button" )
-                {
-                        gUserRating = gRatingButtons[i].value;
-                        break;
-                }
-        }
-
-        for (var i=0; i<gRatingButtons.length; i++)
-        {
-                var rateButton = gRatingButtons[i];
-                rateButton.initialRateValue = rateButton.value; // save it as a property
-                try { rateButton.type = "button"; } catch (e){}// avoid normal submit (use ajax); not working in IE6
-
-                if (navigator.userAgent.indexOf('AppleWebKit/')==-1 && navigator.userAgent.indexOf('MSIE 8')==-1) rateButton.value = ""; //hide the text IE<8/Opera - breaks safari
-                with (rateButton.style)
-                {
-                        textIndent = "-50px"; //hide the text FF
-                        marginLeft = marginRight = 0;
-                }
-
-                if (i!=gRatingButtons.length-1 && rateButton.nextSibling.nodeType == 3 /*TEXT_NODE*/)
-                        rateButton.parentNode.removeChild(rateButton.nextSibling);
-                if (i>0 && rateButton.previousSibling.nodeType == 3 /*TEXT_NODE*/)
-                        rateButton.parentNode.removeChild(rateButton.previousSibling);
-
-                pwgAddEventListener(rateButton, "click", updateRating);
-                pwgAddEventListener(rateButton, "mouseout", resetRatingStarDisplay);
-                pwgAddEventListener(rateButton, "mouseover", updateRatingStarDisplayEvt);
-        }
-        resetRatingStarDisplay();
-}
-
-function resetRatingStarDisplay()
-{
-        updateRatingStarDisplay( gUserRating );
-}
-
-function updateRatingStarDisplay(userRating)
-{
-        for (var i=0; i<gRatingButtons.length; i++)
-                gRatingButtons[i].className = (userRating!=="" && userRating>=gRatingButtons[i].initialRateValue ) ? "rateButtonStarFull" : "rateButtonStarEmpty";
-}
-
-function updateRatingStarDisplayEvt(e)
-{
-        updateRatingStarDisplay(
-                e.target ? e.target.initialRateValue : e.srcElement.initialRateValue);
-}
-
-function updateRating(e)
-{
-        var rateButton = e.target || e.srcElement;
-        if (rateButton.initialRateValue == gUserRating)
-                return false; //nothing to do
-
-        for (var i=0; i<gRatingButtons.length; i++) gRatingButtons[i].disabled=true;
-        var y = new PwgWS(gRatingOptions.rootUrl);
-        y.callService(
-                "pwg.images.rate", {image_id: gRatingOptions.image_id, rate: rateButton.initialRateValue } ,
-                {
-                        onFailure: function(num, text) {
-                                alert(num + " " + text);
-                                document.location = rateButton.form.action + "&rate="+rateButton.initialRateValue;
-                        },
-                        onSuccess: function(result) {
-                                gUserRating = rateButton.initialRateValue;
-                                for (var i=0; i<gRatingButtons.length; i++) gRatingButtons[i].disabled=false;
-                                if (gRatingOptions.updateRateElement) gRatingOptions.updateRateElement.innerHTML = gRatingOptions.updateRateText;
-                                if (gRatingOptions.ratingSummaryElement)
-                                {
-                                        var t = gRatingOptions.ratingSummaryText;
-                                        var args =[result.average, result.count], idx = 0, rexp = new RegExp( /%\.?\d*[sdf]/ );
-                                        //_xxx = t.match( rexp );
-                                        while (idx<args.length) t=t.replace(rexp, args[idx++]);
-                                        gRatingOptions.ratingSummaryElement.innerHTML = t;
-                                }
-                        }
-                }
-        );
-        return false;
-}/**
- * Cookie plugin
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options=$.extend({},options);options.expires=-1;}
-var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}
-expires='; expires='+date.toUTCString();}
-var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}
-return cookieValue;}};

extensions/simple_themes/simple/template/about.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'About'|@translate}</h2>
@@ -12 +12 @@
   </ul>
   {/if}
+  {if not empty($about_msgs)}
+    {foreach from=$about_msgs item=elt}
+    {$elt}
+    {/foreach}
+  {/if}
 </div>

extensions/simple_themes/simple/template/comments.tpl

@@ -11 +11 @@
       <label>{'Keyword'|@translate} : <input type="text" name="keyword" value="{$F_KEYWORD}"></label>
       <label>{'Author'|@translate} : <input type="text" name="author" value="{$F_AUTHOR}"></label>
-      <label>{'Category'|@translate} :
+      <label>{'Album'|@translate} :
       <select name="cat">
         <option value="0">------------</option>

extensions/simple_themes/simple/template/header.tpl

@@ -6 +6 @@
 {if isset($meta_ref) }
   {if isset($INFO_AUTHOR)}
-  <meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
+  <meta name="author" content="{$INFO_AUTHOR|@strip_tags:false|@replace:'"':' '}">
   {/if}
   {if isset($related_tags)}
@@ -54 +54 @@
   <link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (images, comments)'|@translate}" href="{$U_FEED}">
   {/if}
+
   {get_combined_scripts load='header'}
-  {combine_script id="simplescripts" require="jquery" path="themes/simple/js/scripts.min.js"}
+  {combine_script id='jquery' path='themes/default/js/jquery.min.js'}
+  {combine_script id='jquery.cookie' path='themes/simple/js/jquery.cookie.min.js'}
+  {combine_script id='rating' path='themes/default/js/rating.js'}
+  {combine_script id='core.scripts' path='themes/default/js/scripts.js'}
+  {combine_script id='simple.scripts' path='themes/simple/js/scripts.js'}
 
   {if not empty($head_elements)}

extensions/simple_themes/simple/template/identification.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Identification'|@translate}</h2>

extensions/simple_themes/simple/template/mainpage_categories.tpl

@@ -4 +4 @@
     <div class="illustration">
       <a href="{$cat.URL}">
-        <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{'shows images at the root of this category'|@translate}">
+        <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'display this album'|@translate}">
       </a>
     </div>

extensions/simple_themes/simple/template/menubar.tpl

@@ -2 +2 @@
 <div id="menubar">
   {foreach from=$blocks key=id item=block}
-  {if ( not empty($block->template) or not empty($block->raw_content) )}
   <div id="{$id}">
     {if not empty($block->template)}
@@ -10 +9 @@
     {/if}
   </div>
-  {/if}
   {/foreach}
 </div>

extensions/simple_themes/simple/template/menubar_categories.tpl

@@ -1 @@
-<h3><a href="{$block->data.U_CATEGORIES}">{'Categories'|@translate}</a></h3>
+<h3><a href="{$block->data.U_CATEGORIES}">{'Albums'|@translate}</a></h3>
 
 {assign var='ref_level' value=0}
@@ -21 +21 @@
 {'</li></ul>'|@str_repeat:$ref_level}
 
-{if isset($block->data.U_UPLOAD)}
-<ul>
-  <li>
-    <a href="{$block->data.U_UPLOAD}">{'Upload a 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>

extensions/simple_themes/simple/template/menubar_tags.tpl

@@ -6 +6 @@
        {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)}"
+         title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photo are also linked to current tags', $tag.counter)}"
          rel="nofollow">+
        {else}
          href="{$tag.URL}"
-         title="{'See images linked to this tag only'|@translate}">
+         title="{'display photos linked to this tag'|@translate}">
        {/if}
        {$tag.name}</a>

extensions/simple_themes/simple/template/nbm.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Notification'|@translate}</h2>

extensions/simple_themes/simple/template/notification.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Notification'|@translate}</h2>
@@ -8 +8 @@
   <p>{'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'|@translate}</p>
   <ul>
-    <li><a href="{$U_FEED_IMAGE_ONLY}">{'Image only RSS feed'|@translate}</a></li>
-    <li><a href="{$U_FEED}">{'Complete RSS feed (images, comments)'|@translate}</a></li>
+    <li><a href="{$U_FEED_IMAGE_ONLY}">{'Photos only RSS feed'|@translate}</a></li>
+    <li><a href="{$U_FEED}">{'Complete RSS feed (photos, comments)'|@translate}</a></li>
   </ul>
 </div>

extensions/simple_themes/simple/template/password.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a class="button" href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a></li>
+    <li><a class="button" href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Password forgotten'|@translate}</h2>

extensions/simple_themes/simple/template/picture.tpl

@@ -101 +101 @@
         {/if}
         {if $display_info.categories and isset($related_categories)}
-        <dt>{'Categories'|@translate}</dt>
+        <dt>{'Albums'|@translate}</dt>
         <dd>
           {foreach from=$related_categories item=cat name=tag_loop}

extensions/simple_themes/simple/template/picture_content.tpl

@@ -1 @@
-{if isset($high) }
+{if isset($high)}
 <a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
 {/if}
-  <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
+        <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
         {if isset($COMMENT_IMG)}
                 title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
@@ -8 +8 @@
 {if isset($high) }
 </a>
-  <p>{'Click on the picture to see it in high definition'|@translate}</p>
+        <p>{'Click on the photo to see it in high definition'|@translate}</p>
 {/if}

extensions/simple_themes/simple/template/profile.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Profile'|@translate}</h2>

extensions/simple_themes/simple/template/register.tpl

@@ -39 +39 @@
         <li>
         <span class="property">
-            <label for="mail_address">{'Mail address'|@translate}</label>
+            <label for="mail_address">{'Email address'|@translate}</label>
         </span>
           <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" >
@@ -47 +47 @@
     </fieldset>
     <p class="bottomButtons">
+      <input type="hidden" name="key" value="{$F_KEY}" >
       <input class="submit" type="submit" name="submit" value="{'Register'|@translate}">
       <input class="submit" type="reset" value="{'Reset'|@translate}">

extensions/simple_themes/simple/template/search.tpl

@@ -93 +93 @@
   <fieldset>
     <legend>{'Search Options'|@translate}</legend>
-  <label>{'Search in Categories'|@translate}
+  <label>{'Search in albums'|@translate}
       <select class="categoryList" name="cat[]" multiple="multiple" >
         {html_options options=$category_options selected=$category_options_selected}
@@ -99 +99 @@
     </label>
     <ul>
-      <li><label>{'Search in subcategories'|@translate}</label></li>
+      <li><label>{'Search in sub-albums'|@translate}</label></li>
       <li><label>
         <input type="radio" name="subcats-included" value="1" checked="checked" />{'Yes'|@translate}

extensions/simple_themes/simple/template/search_rules.tpl

@@ -33 +33 @@
     {if isset($search_categories) }
     <li>
-      <p>{'Categories'|@translate}</p>
+      <p>{'Albums'|@translate}</p>
       <ul>
         {foreach from=$search_categories item=v}

extensions/simple_themes/simple/template/tags.tpl

@@ -2 +2 @@
   <ul class="categoryActions">
   {if $display_mode == 'letters'}
-    <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}">{'show tag cloud'|@translate}</a></li> « 
+    <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}">{'show tag cloud'|@translate}</a></li> «
   {/if}
   {if $display_mode == 'cloud'}
-    <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}">{'group by letters'|@translate}</a></li> « 
+    <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}">{'group by letters'|@translate}</a></li> «
   {/if}
     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
@@ -16 +16 @@
   <div id="fullTagCloud">
     {foreach from=$tags item=tag}
-                <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d image', '%d images', $tag.counter)}">{$tag.name}</a></span>
+                <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}">{$tag.name}</a></span>
     {/foreach}
   </div>
@@ -31 +31 @@
           <tr class="tagLine">
             <td><a href="{$tag.URL}">{$tag.name}</a></td>
-        <td class="nbEntries">{$pwg->l10n_dec('%d image', '%d images', $tag.counter)}</td>
+        <td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td>
           </tr>
           {/foreach}

extensions/simple_themes/simple/template/upload.tpl

@@ -1 +1 @@
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a></li>
+    <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li>
   </ul>
   <h2>{'Upload a picture'|@translate}</h2>
@@ -33 +33 @@
         <!-- category -->
         <li>
-          <div class="property">{'Category'|@translate}</div>
+          <div class="property">{'Album'|@translate}</div>
           {html_options name="category" options=$categories selected=$categories_selected}
         </li>

extensions/simple_themes/simple/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: Simple Grey
-Version: 2.3.1
+Version: 2.3
 Description: Simple Grey
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=308