- Japanese flag

- <p> support in Sylvia menubar
- Admin Help is chartered (First use of the discrete links)
merge -c3017 from branch 2.0 to trunk






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

3 files changed, 21 insertions, 1 deletions

diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css
index 25353e4b6..9126a6e0b 100644
--- a/admin/template/goto/theme/roma/theme.css
+++ b/admin/template/goto/theme/roma/theme.css
@@ -51,6 +51,21 @@ text-transform:none; font-weight:bold; padding-left:20px; width:54%; }
 font-size:14px; line-height:21px; }
 .instructions { overflow-y:scroll; overflow-x:hidden; }
 .instructions  h3 { text-align: center; margin: 30px 0 0 0; }
+
+.instructions { text-align:left; padding-top:5px;}
+.instructions LI { margin-bottom:5px; }
+.instructionBlock {border: 1px solid #666; margin: 5px; overflow: hidden;}
+.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: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; }
 .content ul.thumbnails span.wrap2 { border:1px solid #666; padding: 4px; }
 .content ul.thumbnails span.wrap2 { -moz-border-radius-bottomleft:4px; -moz-border-radius-bottomright:4px; -moz-border-radius-topleft:4px; -moz-border-radius-topright:4px; }
@@ -195,4 +210,4 @@ display:block; height:85px; left:225px; position:relative; top:-42px; width:313p
 html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers */
 * html[lang="en"] body .content h2 , *+html[lang="en"] body .content h2 { text-transform:capitalize; } /* IE */
 *+html  .bigtext { left: 70px; }
-*+html  .bigbutton input, * html  .bigbutton input  { left:0px; position:relative; top:-40px; }
\ No newline at end of file
+*+html  .bigbutton input, * html  .bigbutton input  { left:0px; position:relative; top:-40px; }
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 b84ca4b32..a6d4813db 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;