From 36ea7e0387b15e87e23c76cc4dfb9b93cfd9f222 Mon Sep 17 00:00:00 2001
From: vdigital <vdigital@piwigo.org>
Date: Tue, 23 Dec 2008 19:33:44 +0000
Subject: [PATCH] - 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
---
 admin/template/goto/theme/roma/theme.css |  11 ++++++---
 language/en_UK/help.html                 |  28 +++++++++++------------
 plugins/language_switch/icons/jp_JP.gif  | Bin 0 -> 779 bytes
 template/yoga/theme/Sylvia/theme.css     |   5 ++++
 4 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 plugins/language_switch/icons/jp_JP.gif

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 0000000000000000000000000000000000000000..b582257d24001562ee77a05b41ddd8703f478cac
GIT binary patch
literal 779
zcmYk3T}V@57{}jpb~c^aTxv6Q>D*k~ab^Z$S_+vpmFzqE)X1_AjA**Avva(d3KddT
zc+*u#5*0zzMPN`-A?ZcfH<bu21uNS*@0re}+s^xT)>Z$DhvyH^!}I6&)HT>EDqB_n
zEtm!XAuM48i$EM>31NhzSng0<q)EZ5!2Ith!ZD0P7DAGw7>+|50j)rwfnX)D6vs$H
zk~|=9Mj@@@3jmsfynzU9TZ^KL;i?>HA|u;M!ev^XCT3Ts#IXbo#EgxY=UPQG#ak$`
zNCC3|iiD$|-bBvq3-_|Iu~ESWq@O=xzk`B_jE}$Lb3yo2BaZ$F+DIhDW-HQzxgg>`
zCg=%hR6>h#t~hP})ibCEyjg)}rf^7@Z??}_D2(M)WT-L&mZ~64Eeu@x)4FrEzJy;5
z7Or)R)%p127_<_+nF!hdG=RCL8tK<0ic3PBiO&O(k*8u=8Z;BJ#c0q<;^8MyzGyd#
zCQ4kRSs1z>$_9c3h!r{^i<G{7Ubub{AsJsxq=AIv3A9oItE>beEKBwn{HKCN>Ypo4
z)WlCf683xDz~%9Iy==RiQzkhXorY7e9+%I-xV)K^Q|F}|c|9D<dOb`U%Q38rrC7Ie
zdCIx^m525mUg70@zB{))FBmF`E!lPU$o`xYduus|cbFJvd~RpE$9{5Mat*1rtvXun
zyXRtv3Cid6aiwi0a;tiGM@I3^rneu)G%xmKiePlvrXIbT)Na0Nx;=V9moyv59<q$l
zBv)Rl9;~(Zs5%S>4t{7opI7Bf9qKp{*sfpO>@U<hx{bQZQ;fdlLET$W)i1p6IzCdD
zMl=|Wer=aRQ^I-zbfE1DaoIV&x2AtfU%xuL(0`|9)ee6(aoX_xVXYPD*DraWTyXPP
zV{d-;jVDWWsm~vzsC0n>{gg5{-8j&Bw`XKr0UVm(*TF*ntrlew?Wi5>%d2=O1P*p;
p-vAXeX?VF&`{`Y}V)9F_u5oIbWM)#iM~_Wl|HS0zct$eV@E2VtccK6Q

literal 0
HcmV?d00001

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;