- Japanese flag

- <p> support in Sylvia menubar
- Admin Help is chartered (First use of the discrete links)

git-svn-id: http://piwigo.org/svn/branches/2.0@3017 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 27 insertions, 17 deletions

diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css
index c9f3dc0c3..c189701fd 100644
--- a/admin/template/goto/theme/roma/theme.css
+++ b/admin/template/goto/theme/roma/theme.css
@@ -48,13 +48,18 @@ text-transform:none; font-weight:bold; padding-left:20px; width:54%; }
 .content dl, dd { margin:5px; }
 .content div.titrePage { height:55px; }
 
-.instructions { text-align:left;}
+.instructions { text-align:left; padding-top:5px;}
 .instructions LI { margin-bottom:5px; }
 .instructionBlock {border: 1px solid #666; margin: 5px; overflow: hidden;}
-.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded {font-size:110%; cursor: pointer; overflow: hidden; background-repeat: no-repeat; background-position: left center; padding-left: 20px; background-color: #111; padding: 5px 20px; color: #ff3363;}
+.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded {background-color:#111; background-position:15px center;
+background-repeat:no-repeat; color:#444; cursor:pointer; font-size:110%; overflow:hidden; padding:8px 41px;}
+.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span {border-bottom: 1px solid #444; }
+ .instructionBlockHeaderCollapsed:hover span, .instructionBlockHeaderExpanded:hover span, 
+ .instructionBlockHeaderCollapsed:focus span, .instructionBlockHeaderExpanded:focus span { border-bottom-color: #111; }
+ 
 .instructionBlockHeaderCollapsed { background-image: url(../../icon/expand.png);}
 .instructionBlockHeaderExpanded { background-image: url(../../icon/collapse.png);}
-.instructionBlockContent { padding:5px;}
+.instructionBlockContent { padding:0 15px 15px;}
 SPAN.pwgScreen { font-style:italic; border-bottom:1px dotted #666}
 
 .content ul.thumbnails span.wrap2:hover { background-color:#111; border:1px solid #FF3363; color:#666; }
diff --git a/language/en_UK/help.html b/language/en_UK/help.html
index 98e5d31a5..360ff45e8 100644
--- a/language/en_UK/help.html
+++ b/language/en_UK/help.html
@@ -6,9 +6,9 @@
     id="pLoader_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('pLoader_header', 'pLoader_content')"
-  >
+  ><span>
     Add photos, the pLoader way
-  </div>
+  </span></div>
   <div
     id="pLoader_content"
     class="instructionBlockContent"
@@ -31,9 +31,9 @@ Congratulations! You have successfuly created the first category of your photo g
     id="FTP_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('FTP_header', 'FTP_content')"
-  >
+  ><span>
     Add photos, the FTP way
-  </div>
+  </span></div>
   <div
     id="FTP_content"
     class="instructionBlockContent"
@@ -154,9 +154,9 @@ Congratulations! You have successfuly created the first category of your photo g
     id="permissions_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('permissions_header', 'permissions_content')"
-  >
+  ><span>
     Permissions
-  </div>
+  </span></div>
   <div
     id="permissions_content"
     class="instructionBlockContent"
@@ -200,9 +200,9 @@ Congratulations! You have successfuly created the first category of your photo g
     id="groups_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('groups_header', 'groups_content')"
-  >
+  ><span>
     Groups
-  </div>
+  </span></div>
   <div
     id="groups_content"
     class="instructionBlockContent"
@@ -230,9 +230,9 @@ Congratulations! You have successfuly created the first category of your photo g
     id="upload_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('upload_header', 'upload_content')"
-  >
+  ><span>
     Upload by users
-  </div>
+  </span></div>
   <div
     id="upload_content"
     class="instructionBlockContent"
@@ -260,9 +260,9 @@ must validate uploaded photos in <span class="pwgScreen">Administration &raquo;
     id="categoryLinks_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('categoryLinks_header', 'categoryLinks_content')"
-  >
+  ><span>
     Links between elements and categories, virtual categories
-  </div>
+  </span></div>
   <div
     id="categoryLinks_content"
     class="instructionBlockContent"
@@ -285,9 +285,9 @@ must validate uploaded photos in <span class="pwgScreen">Administration &raquo;
     id="misc_header"
     class="instructionBlockHeaderCollapsed"
     onclick="blockToggleDisplay('misc_header', 'misc_content')"
-  >
+  ><span>
     Miscellanous informations
-  </div>
+  </span></div>
   <div
     id="misc_content"
     class="instructionBlockContent"
diff --git a/plugins/language_switch/icons/jp_JP.gif b/plugins/language_switch/icons/jp_JP.gif
new file mode 100644
index 000000000..b582257d2
--- /dev/null
+++ b/plugins/language_switch/icons/jp_JP.gif
diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index 7b7b303ea..2e5412e80 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -100,6 +100,11 @@ BODY {
 	border: 0; 
 	overflow-x: hidden;
 }
+#menubar DD P {
+  background:transparent url(images/menuBox_sides.gif) repeat-y scroll left bottom; 
+  padding: 2px 16px 0; 
+  margin: 0;
+}
 #menubar UL, #menubar #mbCategories p, #menubar .illustration  { 
 	background:transparent url(images/menuBox_sides.gif) repeat-y scroll left bottom;
 	margin:0;