Changeset 13549 for extensions/simple_themes

Timestamp:

Mar 14, 2012, 2:34:13 PM (12 years ago)

Author:

plg

Message:

import theme Simple version 2.3

• if cl_conflit is used, don't add jQuery.noConflict
• fix the possibility to toggle visibility of image informations
• show logout link when connected - thanks to gbo
• update jquery to 1.4.4
• backport commit from piwigo: r6244, r6430 & r6438
• add gitignore
• update javascripts + add script to combine/minify
• apply r6594 from piwigo's trunk
• move jquery in the header, using known_script
• translation for the menu title
• add 1px icon start_filter.png to avoid loading error with rvtree plugin
• margin for error & info divs

Location:

extensions/simple_themes/simple

Files:

• .gitignore (added)
• README.md (modified) (5 diffs)
• content.css (modified) (5 diffs)
• icon/start_filter.png (added)
• js/compress.sh (added)
• js/jquery-1.4.4.min.js (added)
• js/pwgscripts.js (added)
• js/rating.js (modified) (2 diffs)
• js/rating.min.js (deleted)
• js/scripts.js (modified) (3 diffs)
• js/scripts.min.js (added)
• js/simplescripts.js (added)
• language (added)
• language/en_UK (added)
• language/en_UK/theme.lang.php (added)
• language/fr_FR (added)
• language/fr_FR/theme.lang.php (added)
• template/comment_list.tpl (modified) (2 diffs)
• template/comments.tpl (modified) (1 diff)
• template/footer.tpl (modified) (2 diffs)
• template/header.tpl (modified) (4 diffs)
• template/identification.tpl (modified) (3 diffs)
• template/index.tpl (modified) (1 diff)
• template/mainpage_categories.tpl (modified) (1 diff)
• template/menubar_categories.tpl (modified) (1 diff)
• template/menubar_tags.tpl (modified) (1 diff)
• template/picture.tpl (modified) (3 diffs)
• template/picture_nav_buttons.tpl (modified) (2 diffs)
• theme.css (modified) (5 diffs)
• themeconf.inc.php (modified) (2 diffs)

extensions/simple_themes/simple/README.md

@@ -10 +10 @@
 -------
 
-Copyright(C) 2009, 2010 Saïmon <contact@saimon.org>
+Copyright(C) 2009-2011 Simon C. <contact at saimon dot org>
 
 The "Simple grey"  theme for Piwigo is free software:  you can redistribute it
@@ -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.2
+### version 2.3 (07/01/2011)
+
+* if cl_conflit is used, don't add jQuery.noConflict
+* fix the possibility to toggle visibility of image informations
+* show logout link when connected - thanks to gbo
+* update jquery to 1.4.4
+* backport commit from piwigo: r6244, r6430 & r6438
+* add gitignore
+* update javascripts + add script to combine/minify
+* apply r6594 from piwigo's trunk
+* move jquery in the header, using known_script
+* translation for the menu title
+* add 1px icon start_filter.png to avoid loading error with rvtree plugin
+* margin for error & info divs
+
+### version 2.2 (23/09/2010)
 
 * fix the calendar's pages
@@ -52 +73 @@
 * remove standard deviation for votes
 
-### version 2.1
+### version 2.1 (16/06/2010)
 
 - bugfix for user's profile - use default `profile_content.tpl`
@@ -62 +83 @@
 - add login link in the footer
 
-### version 2.0
+### version 2.0 (31/05/2010)
 
 - adapt the theme for Piwigo 2.1
@@ -68 +89 @@
 - tweak for plugins adding icons in .titrePage (piwishak, addthis, ...)
 
-TODO
-----
 
-* use known_script : does not work in the footer ... {known_script id="jquery"
-  src=$ROOT_URL|@cat:"themes/simple/js/jquery-1.4.2.min.js"}
+## TODO
+
+- put rss link in header.tpl (when ready)

extensions/simple_themes/simple/content.css

@@ -34 +34 @@
 #the_page {
   width: 85%;
-  min-width: 900px;
+  min-width: 960px;
   margin: 0 auto;
   padding: 0;
@@ -123 +123 @@
   color: #e04040;
   border: 1px dashed;
-  margin: 0 1em;
+  margin: 1em;
 }
 
@@ -292 +292 @@
   float: right;
   clear: right;
-  width: 20%;
-  margin: 0 1em 0;
+  width: 180px;
+  margin: 0 10px;
 }
 
@@ -311 +311 @@
 #theImage {
   text-align: center;
-  padding: 1em 0;
+  padding: 1em 0 2em;
   margin: auto;
 }
@@ -398 +398 @@
 }
 
+#theCommentsPage form label {
+  display: inline-block;
+  line-height: 25px;
+}
+
 /* calendar */
 

extensions/simple_themes/simple/js/rating.js

@@ -36 +36 @@
                         rateButton.parentNode.removeChild(rateButton.previousSibling);
 
-                if(window.addEventListener){ // Mozilla, Netscape, Firefox
-                        rateButton.addEventListener("click", updateRating, false );
-                        rateButton.addEventListener("mouseout", resetRatingStarDisplay, false );
-                        rateButton.addEventListener("mouseover", updateRatingStarDisplayEvt, false );
-                }
-                else if(window.attachEvent) { // IE
-                        rateButton.attachEvent("onclick", updateRating);
-                        rateButton.attachEvent("onmouseout", resetRatingStarDisplay);
-                        rateButton.attachEvent("onmouseover", updateRatingStarDisplayEvt);
-                }
+                pwgAddEventListener(rateButton, "click", updateRating);
+                pwgAddEventListener(rateButton, "mouseout", resetRatingStarDisplay);
+                pwgAddEventListener(rateButton, "mouseover", updateRatingStarDisplayEvt);
         }
         resetRatingStarDisplay();
@@ -89 +82 @@
                                 {
                                         var t = gRatingOptions.ratingSummaryText;
-                                        var args =[result.average, result.count, result.stdev], idx = 0, rexp = new RegExp( /%\.?\d*[sdf]/ );
-                                        _xxx = t.match( rexp );
+                                        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;

extensions/simple_themes/simple/js/scripts.js

@@ -1 @@
-jQuery.noConflict();
+// if cl_conflit is not used, use jQuery.noConflict to work with other libs
+if (typeof (Conflit) == "undefined")
+   jQuery.noConflict();
 
 jQuery(document).ready(function($){
@@ -28 +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)
@@ -39 +305 @@
 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;}};
-
-/**
- * Piwigo scripts
- */
-function phpWGOpenWindow(theURL,winName,features)
-{img=new Image();img.src=theURL;if(img.complete)
-{var width=img.width+40;var height=img.height+40;}
-else
-{var width=640;var height=480;img.onload=resizeWindowToFit;}
-newWin=window.open(theURL,winName,features+',left=2,top=1,width='+width+',height='+height);}
-function resizeWindowToFit()
-{newWin.resizeTo(img.width+50,img.height+100);}
-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=new Array();for(var i=1;i<arguments.length;i++)
-args[i-1]=arguments[i];return function(){return __method.apply(object,args);}}
-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(this.transport.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:{}}

extensions/simple_themes/simple/template/comment_list.tpl

@@ -12 +12 @@
         {if isset($comment.U_DELETE)}
         <li>
-                <a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
-                        [delete]
-                </a>
+          <a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
+            [delete]
+          </a>
         </li>
         {/if}
-    {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
-    <li>
-      <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
-        [edit]
-      </a>
-    </li>
-    {/if}
+        {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
+        <li>
+          <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
+            [edit]
+          </a>
+        </li>
+        {/if}
         {if isset($comment.U_VALIDATE)}
         <li>
-                <a href="{$comment.U_VALIDATE}" title="{'validate this comment'|@translate}">
-                        [validate]
-                </a>
+          <a href="{$comment.U_VALIDATE}" title="{'validate this comment'|@translate}">
+            [validate]
+          </a>
         </li>
         {/if}
@@ -37 +37 @@
       <a name="edit_comment"></a>
       <form  method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
-          <fieldset>
-                <legend>{'Edit a comment'|@translate}</legend>
-                <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
-                <input type="hidden" name="key" value="{$comment.KEY}">
-                <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
-                <input class="submit" type="submit" value="{'Submit'|@translate}">
-          </fieldset>
+        <fieldset>
+          <legend>{'Edit a comment'|@translate}</legend>
+          <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
+          <input type="hidden" name="key" value="{$comment.KEY}">
+          <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
+          <input class="submit" type="submit" value="{'Submit'|@translate}">
+        </fieldset>
       </form>
       {else}

extensions/simple_themes/simple/template/comments.tpl

@@ -8 +8 @@
   <form class="filter" action="{$F_ACTION}" method="get">
     <fieldset>
-    <legend>{'Filter'|@translate}</legend>
-    <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}
+      <legend>{'Filter'|@translate}</legend>
+      <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} :
       <select name="cat">
         <option value="0">------------</option>
         {html_options options=$categories selected=$categories_selected}
       </select>
-    </label>
-    <label>
-      {'Since'|@translate}
-          <select name="since">
-            {html_options options=$since_options selected=$since_options_selected}
-          </select>
-    </label>
+      </label>
+      <label>{'Since'|@translate} :
+      <select name="since">
+        {html_options options=$since_options selected=$since_options_selected}
+      </select>
+      </label>
     </fieldset>
     <fieldset>
       <legend>{'Display'|@translate}</legend>
-    <label>
-      {'Sort by'|@translate}
-          <select name="sort_by">
-            {html_options options=$sort_by_options selected=$sort_by_options_selected}
-          </select>
-    </label>
-    <label>
-      {'Sort order'|@translate}
-          <select name="sort_order">
-            {html_options options=$sort_order_options selected=$sort_order_options_selected}
-          </select>
-    </label>
-    <label>
-      {'Number of items'|@translate}
-          <select name="items_number">
-            {html_options options=$item_number_options selected=$item_number_options_selected}
-          </select>
-    </label>
+      <label>{'Sort by'|@translate} :
+      <select name="sort_by">
+        {html_options options=$sort_by_options selected=$sort_by_options_selected}
+      </select>
+      </label>
+      <label>{'Sort order'|@translate} :
+      <select name="sort_order">
+        {html_options options=$sort_order_options selected=$sort_order_options_selected}
+      </select>
+      </label>
+      <label>{'Number of items'|@translate} :
+      <select name="items_number">
+        {html_options options=$item_number_options selected=$item_number_options_selected}
+      </select>
+      </label>
     </fieldset>
     <p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>

extensions/simple_themes/simple/template/footer.tpl

@@ -5 +5 @@
     {'Powered by'|@translate} <a href="{$PHPWG_URL}">Piwigo</a>
      - <a href="{$themeconf.url}">{$themeconf.name}</a>
-     - <a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a>
-    {if isset($CONTACT_MAIL)}
+    {if isset($U_LOGIN)}
+    - <a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a>
+    {/if}
+    {if isset($U_LOGOUT)}
+    - <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
+    {/if}
+     {if isset($CONTACT_MAIL)}
     - {'Contact'|@translate}
     <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
@@ -17 +22 @@
   {/if}
 </div> <!-- the_page -->
-<script type="text/javascript" src="{$ROOT_URL}themes/{$themeconf.theme_dir}/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="{$ROOT_URL}themes/{$themeconf.theme_dir}/js/scripts.js"></script>
 {if isset($debug.QUERIES_LIST)}
 <div id="debug">

extensions/simple_themes/simple/template/header.tpl

@@ -5 +5 @@
   <meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
 {if isset($meta_ref) }
-{if isset($INFO_AUTHOR)}
-<meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
-{/if}
-{if isset($related_tags)}
-<meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}">
-{/if}
-{if isset($COMMENT_IMG)}
-<meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
-{else}
-<meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
-{/if}
+  {if isset($INFO_AUTHOR)}
+  <meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
+  {/if}
+  {if isset($related_tags)}
+  <meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}">
+  {/if}
+  {if isset($COMMENT_IMG)}
+  <meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
+  {else}
+  <meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
+  {/if}
 {/if}
   <title>{$PAGE_TITLE} - {$GALLERY_TITLE}</title>
@@ -21 +21 @@
   <link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
   <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
-  {if isset($first.U_IMG)   }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if}
-  {if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if}
-  {if isset($next.U_IMG)    }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if}
-  {if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
-  {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
+  {if isset($first.U_IMG)}
+  <link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >
+  {/if}
+  {if isset($previous.U_IMG)}
+  <link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >
+  {/if}
+  {if isset($next.U_IMG)}
+  <link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >
+  {/if}
+  {if isset($last.U_IMG)}
+  <link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >
+  {/if}
+  {if isset($U_UP)}
+  <link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >
+  {/if}
 
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/simple/content.css">
@@ -32 +42 @@
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
   {/if}
-  {if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+  {if !empty($theme.local_head)}{include file=$theme.local_head}{/if}
   {/foreach}
 
   {if isset($U_PREFETCH)}<link rel="prefetch" href="{$U_PREFETCH}">{/if}
-  {if not empty($page_refresh)}<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
+  {if not empty($page_refresh)}
+  <meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">
+  {/if}
   {if isset($U_FEED)}
   <link rel="alternate" type="application/rss+xml" title="{'Image only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
@@ -45 +57 @@
     {/foreach}
   {/if}
+  {known_script id="jquery" src=$ROOT_URL|@cat:"themes/simple/js/jquery-1.4.4.min.js"}
+  {known_script id="simplescripts" src=$ROOT_URL|@cat:"themes/simple/js/scripts.min.js"}
   <script type="text/javascript">
     document.documentElement.className = 'js';

extensions/simple_themes/simple/template/identification.tpl

@@ -18 +18 @@
     <fieldset>
       <legend>{'Connection settings'|@translate}</legend>
-    <input type="hidden" name="redirect" value="{$U_REDIRECT|urlencode}">
       <ul>
         <li>
@@ -35 +34 @@
         <li>
         <span class="property">
-          <label for="Auto login">{'Auto login'|@translate}</label>
+          <label for="remember_me">{'Auto login'|@translate}</label>
         </span>
           <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
@@ -42 +41 @@
       </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="{'Register'|@translate}">{'Register'|@translate}</a>
-    {/if}
-    <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}">{'Forgot your password?'|@translate}</a>
-  </p>
+    <p>
+      <input type="hidden" name="redirect" value="{$U_REDIRECT|@urlencode}">
+      <input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}">
+    </p>
+    <p>
+      {if isset($U_REGISTER) }
+      <a href="{$U_REGISTER}" title="{'Register'|@translate}">{'Register'|@translate}</a>
+      {/if}
+      <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}">{'Forgot your password?'|@translate}</a>
+    </p>
   </form>
 <script type="text/javascript"><!--

extensions/simple_themes/simple/template/index.tpl

@@ -1 +1 @@
 {if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}
 <div class="titrePage">
-  <span id="menuswitcher" title="Afficher/cacher le menu">Menu</span> »
+  <span id="menuswitcher" title="{'Show/hide menu'|@translate}">Menu</span> »
   {if isset($U_EDIT) or isset($U_SLIDESHOW) or !empty($PLUGIN_INDEX_ACTIONS)}
   <ul class="categoryActions">

extensions/simple_themes/simple/template/mainpage_categories.tpl

@@ -9 +9 @@
     <div class="description">
       <h3>
-                <a href="{$cat.URL}">{$cat.NAME}</a>
-                {if !empty($cat.icon_ts)}
-                  <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
-                {/if}
-          </h3>
+        <a href="{$cat.URL}">{$cat.NAME}</a>
+        {if !empty($cat.icon_ts)}
+        <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
+        {/if}
+      </h3>
       {if isset($cat.INFO_DATES) }
       <p class="thumbCatDescNfoDate">{$cat.INFO_DATES}</p>
       {/if}
-
       <p class="thumbCatDescNbImg">{$cat.CAPTION_NB_IMAGES}</p>
       {if not empty($cat.DESCRIPTION)}

extensions/simple_themes/simple/template/menubar_categories.tpl

@@ -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>
+{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>

extensions/simple_themes/simple/template/menubar_tags.tpl

@@ -3 +3 @@
   {foreach from=$block->data item=tag}
   <li>
-        <a class="tagLevel{$tag.level}"
-        {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">+
-        {else}
-                href="{$tag.URL}"
-                title="{'See elements linked to this tag only'|@translate}">
-        {/if}
-                {$tag.name}</a>
+    <a class="tagLevel{$tag.level}"
+       {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">+
+       {else}
+         href="{$tag.URL}"
+         title="{'See images linked to this tag only'|@translate}">
+       {/if}
+       {$tag.name}</a>
   </li>
   {/foreach}

extensions/simple_themes/simple/template/picture.tpl

@@ -80 +80 @@
     <div id="imageInfos">
       <dl>
-        {if $display_info.author}
+        {if $display_info.author and isset($INFO_AUTHOR)}
         <dt>{'Author'|@translate}</dt>
         <dd>{$INFO_AUTHOR}</dd>
         {/if}
-         {if $display_info.created_on}
+        {if $display_info.created_on and isset($INFO_CREATION_DATE)}
         <dt>{'Created on'|@translate}</dt>
         <dd>{$INFO_CREATION_DATE}</dd>
         {/if}
-                 {if $display_info.posted_on}
+        {if $display_info.posted_on}
         <dt>{'Posted on'|@translate}</dt>
         <dd>{$INFO_POSTED_DATE}</dd>
-                {/if}
-        {if isset($related_tags)}
+        {/if}
+        {if $display_info.tags and isset($related_tags)}
         <dt>{'Tags'|@translate}</dt>
-        <dd>{foreach from=$related_tags item=tag name=tag_loop}
+        <dd>
+          {foreach from=$related_tags item=tag name=tag_loop}
           {if !$smarty.foreach.tag_loop.first}, {/if}
-          <a href="{$tag.URL}">{$tag.name}</a>{/foreach}</dd>
+          <a href="{$tag.URL}">{$tag.name}</a>{/foreach}
+        </dd>
         {/if}
-         {if $display_info.tags}
+        {if $display_info.categories and isset($related_categories)}
         <dt>{'Categories'|@translate}</dt>
         <dd>
           {foreach from=$related_categories item=cat name=tag_loop}
-          {if !$smarty.foreach.tag_loop.first}, {/if} {'&nbsp;'|@str_ireplace:'&#32;':$cat}{/foreach}
+          {if !$smarty.foreach.tag_loop.first}, {/if}
+          {'&nbsp;'|@str_ireplace:'&#32;':$cat}{/foreach}
         </dd>
         {/if}
-                 {if $display_info.visits}
+        {if $display_info.visits}
         <dt>{'Visits'|@translate}</dt>
         <dd>{$INFO_VISITS}</dd>
-                 {/if}
-        {if $display_info.average_rate and isset($rate_summary) }
+        {/if}
+        {if $display_info.average_rate}
+        {if isset($rate_summary)}
         <dt>{'Average rate'|@translate}</dt>
         <dd id="ratingSummary">
@@ -133 +137 @@
               {/if}
               {/foreach}
-              <script type="text/javascript" src="{$ROOT_URL}themes/{$themeconf.theme_dir}/js/rating.min.js"></script>
               <script type="text/javascript">
                 makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}',
@@ -145 +148 @@
           </form>
         </dd>
+        {/if}
         {/if}
       </dl>

extensions/simple_themes/simple/template/picture_nav_buttons.tpl

@@ +1 @@
+{if $DISPLAY_NAV_BUTTONS}
 <div class="navButtons">
 {if isset($U_SLIDESHOW_STOP)}
@@ -30 +31 @@
 {/if}
 </div>
+{/if}
 
 <script type="text/javascript">// <![CDATA[

extensions/simple_themes/simple/theme.css

@@ -1 +1 @@
 /* Grey theme for the simple template
-   author: Saïmon <contact at saimon.org> */
+   author: Saïmon <contact at saimon org>
+*/
 
 body {
@@ -21 +22 @@
   color: #999;
 }
+a:hover, #menuswitcher:hover, #theComments h3:hover {
+  color: #f0f0f0;
+}
 
 .titrePage, .titrePage a {
@@ -28 +32 @@
 }
 
-h2, h3 {
-  font-variant: small-caps;
+h2, h3, #menubar dt {
+  /* font-variant: small-caps; */
+  text-transform: uppercase;
+  font-weight: bold;
 }
 
@@ -43 +49 @@
 }
 .thumbnail {
-  border: 2px #707070 solid;
+  border: 2px #606060 solid;
 }
 .thumbnail:hover {
@@ -52 +58 @@
 }
 
-#menubar dt {
-  font-variant: small-caps;
-  font-weight: bold;
-}
-
 /* page content :  categories thumbnails */
 
 .illustration img {
-  border: 1px #606060 solid;
+  border: 2px #606060 solid;
 }
 
 .illustration img:hover {
-  border: 1px #f0f0f0 solid;
+  border: 2px #f0f0f0 solid;
 }
 
 .thumbCatDesc {
-  border-top: 1px #606060 dotted;
+  border-top: 1px #606060 solid;
   text-align: justify;
 }

extensions/simple_themes/simple/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: Simple Grey
-Version: 2.0
-Description: Simple Grey theme
+Version: 2.3
+Description: Simple Grey
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=308
 Author: Saïmon
@@ -23 +23 @@
 
 global $user;
-$user['maxwidth'] = 680;
+$user['maxwidth'] = 720;
+
+load_language('theme.lang', PHPWG_THEMES_PATH.'simple/');
+
 ?>