- Change of the picture page behavior to be able to open the full size image in a new window

- Minor modification for template migration
- Rename of script.js in scripts.js


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

4 files changed, 15 insertions, 22 deletions

diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
index bd5bb43d2..c55c85446 100644
--- a/template/default/admin/user_perm.tpl
+++ b/template/default/admin/user_perm.tpl
@@ -8,11 +8,11 @@
 </form>
 <!-- END search -->
 <!-- BEGIN permission -->
-<div class="admin">{L_AUTH_USER}</div>
+<div class="admin">{L_AUTH_USER} {USERNAME}</div>
 <form action="{F_AUTH_ACTION}" method="POST">
   <ul class="menu">
     <!-- BEGIN category -->
-        <li> <a href="{permission.category.CAT_URL}"><span style="color:{#color}">{permission.category.CAT_NAME}</span></a>
+        <li> <a href="{permission.category.CAT_URL}">{permission.category.CAT_NAME}</a>
         <!-- BEGIN parent_forbidden -->
         {L_PARENT_FORBIDDEN}&nbsp;-&nbsp;
         <!-- END parent_forbidden -->
diff --git a/template/default/category.tpl b/template/default/category.tpl
index be7d0cf1c..7b4353e2c 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -1,4 +1,4 @@
-<div align="center" style="padding:10px;"><img src="template/default/images/logo.jpg" width="360" height="100"></div>
+<div style="padding:3px;"><img src="template/default/images/logo.jpg"></div>
 <table style="width:100%;">
   <tr>
     <td valign="top" style="padding:10px;width:1%;">
@@ -61,7 +61,7 @@
 	  <div class="home">
 			<div class="titrePage">{TITLE}</div>
 			<!-- BEGIN calendar -->
-                          <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
+               <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
 			  <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
 			<!-- END calendar -->
 			<!-- BEGIN thumbnails -->
@@ -76,9 +76,6 @@
 					   title="{thumbnails.line.thumbnail.IMAGE_TITLE}"
 					   class="thumbLink" />
 				  <br />
-				  <!-- BEGIN bullet -->
-				  <img src="./template/default/theme/collapsed.gif" style="border:none;" alt="&gt;" />
-				  <!-- END bullet -->
 				  <span class="{thumbnails.line.thumbnail.IMAGE_STYLE}">{thumbnails.line.thumbnail.IMAGE_NAME}</span></a>
 				  {thumbnails.line.thumbnail.IMAGE_TS}
 				  <!-- BEGIN nb_comments -->
diff --git a/template/default/default.css b/template/default/default.css
index d17a4645b..11c2bfba1 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -2,14 +2,14 @@
 #gauche,#droite
 {
   float:left;
-  width:18%;
+  width:30%;
   text-align:left;
 }
 
 #centre
 {
   float:left;
-  width:64%;
+  width:40%;
   text-align:center;
 }
 
@@ -187,6 +187,7 @@ ul.menu {
 {
   border: 1px solid #000000;
   background-color:#555555;
+  display:block;
 }
 
 .home
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 2dc9c9e00..636963898 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -2,7 +2,7 @@
 <div class="information">{information.INFORMATION}</div>
 <!-- END information -->
 <div class="titrePage">
-  <div id="gauche">{CATEGORY}</div>
+  <div id="gauche"><a href="{U_HOME}">{L_HOME}</a> > {CATEGORY}</div>
   <div id="centre" class="nameImage">{TITLE}</div>
   <div id="droite">{PHOTO}</div>
 </div>
@@ -23,13 +23,6 @@
 	<img src="template/default/theme/metadata.gif" alt="{L_PICTURE_METADATA}" />
   </a>
 </div>
-<!-- BEGIN high -->
-<div class="imgMenu" id="left">
-  <a href="{high.U_HIGH}" title="{L_PICTURE_HIGH}">
-        <img src="template/default/theme/high.gif" alt="{L_PICTURE_HIGH_ALT}" />
-  </a>
-</div>
-<!-- END high -->
 <!-- BEGIN favorite -->
 <div class="imgMenu" id="right">
   <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}">
@@ -59,10 +52,14 @@
 </div>
 <!-- END admin -->
 </div>
-
-<a href="{U_HOME}">
+<!-- BEGIN high -->
+<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=yes,status=yes,resizable=yes,width={high.WIDTH_IMG},height={high.HEIGHT_IMG}')">
+<!-- END high -->
   <img class="image" src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"/>
+<!-- BEGIN high -->
 </a>
+<div style="text-align:center;font-weight:bold;">{L_PICTURE_HIGH}</div>
+<!-- END high -->
 <!-- BEGIN legend -->
 <div class="commentImage">{legend.COMMENT_IMG}</div>
 <!-- END legend -->
@@ -126,9 +123,7 @@
             <!-- END rate_option -->
           </div>
           <!-- END rate -->
- 
-
-          <div style="text-align:center;">{L_BACK}</div>
+         
 <table class="tablecompact">
       <!-- BEGIN comments -->
       <tr align="center" valign="middle">