feature 1519: admin instructions are dispatched into several tabs. Only

applied to en_UK and fr_FR. The help content itself needs some updates
but it will be another set of commits, in this commit, I nearly only
modified the container.

The new "Add Photos" help page only introduces you to 3 main ways to add
photos: direct upload, pLoader and FTP. Each of them has a dedicated tab
on the Admin>Photos>Add screen.

No use of the big question mark icon linked to the Help pages in the
administration header, to avoid having this icon twice : in the header
+ in the content next to H2.

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

5 files changed, 110 insertions, 4 deletions

diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 1a8e828ce..671355703 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -540,7 +540,7 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
 }
 
 #pwgHead {
-  background-color:#222;
+  background-color:#464646;
   height:46px;
 }
 
@@ -744,4 +744,8 @@ BODY#thePopuphelpPage {
 h2 { letter-spacing:2px; font-weight:bold;}
 h2:lang(en) { text-transform:capitalize; }
 
-#pluginsMenuSeparator {width:80%; margin:5px auto;}
\ No newline at end of file
+#pluginsMenuSeparator {width:80%; margin:5px auto;}
+
+#helpContent P {text-align:left; margin-left:10px;}
+#helpContent LI, #ftpPage LI {margin-top:10px;}
+#helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;}
\ No newline at end of file
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index c0fe31a03..7b492aeb1 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -48,9 +48,9 @@
   <div id="headActions">
     Hello {$USERNAME} :
     <a href="{$U_RETURN}" title="Visit Gallery">Visit Gallery</a> |
-    <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Theme</a> |
+    <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Admin Colors</a> |
+    <a href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">Help Me</a> |
     <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
-    <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}admin/themes/default/icon/help.png" class="button" alt="(?)"></a>
   </div>
 </div>
 
diff --git a/admin/themes/default/template/help.tpl b/admin/themes/default/template/help.tpl
new file mode 100644
index 000000000..399c7466f
--- /dev/null
+++ b/admin/themes/default/template/help.tpl
@@ -0,0 +1,7 @@
+<h2>{'Help'|@translate} &raquo; {$HELP_SECTION_TITLE}</h2>
+
+<div id="helpContent">
+
+{$HELP_CONTENT}
+
+</div>
\ No newline at end of file
diff --git a/admin/themes/default/template/photos_add_ftp.tpl b/admin/themes/default/template/photos_add_ftp.tpl
new file mode 100644
index 000000000..e3902efef
--- /dev/null
+++ b/admin/themes/default/template/photos_add_ftp.tpl
@@ -0,0 +1,7 @@
+<div class="titrePage" style="height:25px">
+  <h2>{'FTP + Synchronization'|@translate}</h2>
+</div>
+
+<div id="ftpPage">
+{$FTP_HELP_CONTENT}
+</div>
\ No newline at end of file
diff --git a/admin/themes/default/template/photos_add_ploader.tpl b/admin/themes/default/template/photos_add_ploader.tpl
new file mode 100644
index 000000000..bbff9804e
--- /dev/null
+++ b/admin/themes/default/template/photos_add_ploader.tpl
@@ -0,0 +1,88 @@
+{literal}
+<script type="text/javascript">
+$().ready(function(){
+  $("#pLoaderPage  img").fadeTo("fast", 0.6);
+
+  $("#pLoaderPage  img").hover(
+    function(){
+      $(this).fadeTo("fast", 1.0); // Opacity on hover
+    },
+    function(){
+      $(this).fadeTo("fast", 0.6); // Opacity on mouseout
+    }
+  );
+});
+</script>
+
+<style>
+#pLoaderPage {
+  width:600px;
+  margin:0 auto;
+  font-size:1.1em;
+}
+
+#pLoaderPage P {
+  text-align:left;
+}
+
+#pLoaderPage .downloads {
+  margin:10px auto 0 auto;
+}
+
+#pLoaderPage .downloads A {
+  display:block;
+  width:150px;
+  text-align:center;
+  font-size:16px;
+  font-weight:bold;
+}
+
+#pLoaderPage .downloads A:hover {
+  border:none;
+}
+
+#pLoaderPage LI {
+  margin:20px;
+}
+</style>
+{/literal}
+
+<div class="titrePage">
+  <h2>{'Piwigo Uploader'|@translate}</h2>
+</div>
+
+<div id="pLoaderPage">
+<p>pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.</p>
+
+<ol>
+  <li>
+    Download,
+
+<table class="downloads">
+  <tr>
+    <td>
+      <a href="{$URL_DOWNLOAD_WINDOWS}">
+        <img src="http://piwigo.org/screenshots/windows.png"/>
+        <br>Windows
+      </a>
+    <td>
+    <td>
+      <a href="{$URL_DOWNLOAD_MAC}">
+        <img src="http://piwigo.org/screenshots/mac.png" />
+        <br>Mac
+      </a>
+    <td>
+    <td>
+      <a href="{$URL_DOWNLOAD_LINUX}">
+        <img src="http://piwigo.org/screenshots/linux.png" />
+        <br>Linux
+      </a>
+    <td>
+  </tr>
+</table>
+
+  </li>
+  <li>Install on your computer,</li>
+  <li>Start pLoader and add your photos.</li>
+</ol>
+</div>
\ No newline at end of file