feature 280: Allow visitors/users to choose image ordering inside a category

improvement 82: Viewing pictures from remote galleries does not check anymore 
for the high pictures (existence flag added to create_listing_file and db)

correction: link element in picture is in the head instead of body (w3c spec)

correction: in profile.php the current template was not selected by default

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

4 files changed, 16 insertions, 2 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 1f9e50c66..263342408 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -120,6 +120,16 @@
       <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
       <!-- END search_rules -->
 
+      <!-- BEGIN preferred_image_order -->
+      <li>
+      {lang:Sort order}:
+      <select onchange="document.location = this.options[this.selectedIndex].value;">
+        <!-- BEGIN order -->
+        <option value="{preferred_image_order.order.URL}" {preferred_image_order.order.SELECTED_OPTION}>{preferred_image_order.order.DISPLAY}</option>
+        <!-- END order -->
+      </select>
+      </li>
+      <!-- END preferred_image_order -->
     </ul>
     
   <h2>{TITLE}</h2>
diff --git a/template/yoga/content.css b/template/yoga/content.css
index c339b3033..8bb5df33d 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -119,10 +119,12 @@ UL.categoryActions {
 
 #content UL.categoryActions LI {
   display: inline;
+
 }
 
 #content UL.categoryActions A IMG, UL.categoryActions A {
   border: none;
+  margin-bottom: -5px;
 }
 
 /* User comments */
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index 1c77d706c..9936a1095 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -11,6 +11,9 @@ the "text/nonsense" prevents gecko based browsers to load it -->
 <link rel="stylesheet" type="text/css" media="print" href="template/{themeconf:template}/print.css">
 <link rel="stylesheet" type="text/css" href="template/{themeconf:template}/default-colors.css">
 <link rel="stylesheet" type="text/css" href="template/{themeconf:template}/theme/{themeconf:theme}/theme.css">
+<!-- BEGIN next -->
+<link rel="prefetch" href="{next.U_IMG_SRC}">
+<!-- END next -->
 <!-- BEGIN refresh -->
 <meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
 <!-- END refresh -->
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index ceafa6a96..1c6387ee6 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -39,7 +39,6 @@
 <!-- END last -->
 <!-- BEGIN next -->
   <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next"><img src="{themeconf:icon_dir}/right.png" class="button" alt="next"></a>
-  <link rel="prefetch" href="{next.U_IMG_SRC}"><link rel="prefetch" href="{next.U_IMG}">
 <!-- END next -->
   <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}"><img src="{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
 <!-- BEGIN previous -->
@@ -54,7 +53,7 @@
 
 <div id="theImage">
 <!-- BEGIN high -->
-<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes,width={high.WIDTH_IMG},height={high.HEIGHT_IMG}')">
+<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
 <!-- END high -->
   <img src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}">
 <!-- BEGIN high -->