From 27de15e07661fdff7a19d3ead990c37efb532c7a Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 18 Mar 2010 22:12:30 +0000 Subject: [PATCH] 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 --- admin/help.php | 74 +++- admin/photos_add.php | 10 +- admin/photos_add_ftp.php | 45 +++ admin/photos_add_ploader.php | 45 +++ admin/themes/clear/theme.css | 5 +- admin/themes/default/default-layout.css | 8 +- admin/themes/default/template/header.tpl | 4 +- admin/themes/default/template/help.tpl | 7 + .../default/template/photos_add_ftp.tpl | 7 + .../default/template/photos_add_ploader.tpl | 88 +++++ admin/themes/roma/theme.css | 4 +- include/config_default.inc.php | 9 + language/en_UK/help.html | 310 ---------------- language/en_UK/help/help_add_photos.html | 29 ++ language/en_UK/help/help_groups.html | 11 + language/en_UK/help/help_misc.html | 7 + language/en_UK/help/help_permissions.html | 24 ++ language/en_UK/help/help_user_upload.html | 18 + language/en_UK/help/help_virtual_links.html | 12 + language/en_UK/help/photos_add_ftp.html | 112 ++++++ language/fr_FR/help.html | 330 ------------------ language/fr_FR/help/help_add_photos.html | 32 ++ language/fr_FR/help/help_groups.html | 9 + language/fr_FR/help/help_misc.html | 5 + language/fr_FR/help/help_permissions.html | 15 + language/fr_FR/help/help_user_upload.html | 15 + language/fr_FR/help/help_virtual_links.html | 5 + language/fr_FR/help/photos_add_ftp.html | 141 ++++++++ 28 files changed, 733 insertions(+), 648 deletions(-) create mode 100644 admin/photos_add_ftp.php create mode 100644 admin/photos_add_ploader.php create mode 100644 admin/themes/default/template/help.tpl create mode 100644 admin/themes/default/template/photos_add_ftp.tpl create mode 100644 admin/themes/default/template/photos_add_ploader.tpl delete mode 100644 language/en_UK/help.html create mode 100644 language/en_UK/help/help_add_photos.html create mode 100644 language/en_UK/help/help_groups.html create mode 100644 language/en_UK/help/help_misc.html create mode 100644 language/en_UK/help/help_permissions.html create mode 100644 language/en_UK/help/help_user_upload.html create mode 100644 language/en_UK/help/help_virtual_links.html create mode 100644 language/en_UK/help/photos_add_ftp.html delete mode 100644 language/fr_FR/help.html create mode 100644 language/fr_FR/help/help_add_photos.html create mode 100644 language/fr_FR/help/help_groups.html create mode 100644 language/fr_FR/help/help_misc.html create mode 100644 language/fr_FR/help/help_permissions.html create mode 100644 language/fr_FR/help/help_user_upload.html create mode 100644 language/fr_FR/help/help_virtual_links.html create mode 100644 language/fr_FR/help/photos_add_ftp.html diff --git a/admin/help.php b/admin/help.php index 06bd5ca80..fdffeff01 100644 --- a/admin/help.php +++ b/admin/help.php @@ -22,11 +22,83 @@ // +-----------------------------------------------------------------------+ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | // +-----------------------------------------------------------------------+ check_status(ACCESS_ADMINISTRATOR); -$template->assign('ADMIN_CONTENT', load_language('help.html','',array('return'=>true)) ); +$link = get_root_url().'admin.php?page=help§ion='; +$selected = null; +$help_section_title = null; + +$tabs = array( + array( + 'code' => 'add_photos', + 'label' => 'Add Photos', + ), + array( + 'code' => 'permissions', + 'label' => 'Permissions', + ), + array( + 'code' => 'groups', + 'label' => 'Groups', + ), + array( + 'code' => 'user_upload', + 'label' => 'User Upload', + ), + array( + 'code' => 'virtual_links', + 'label' => 'Virtual Links', + ), + array( + 'code' => 'misc', + 'label' => 'Miscellaneous', + ), + ); + +if (!isset($_GET['section'])) +{ + $section = $tabs[0]['code']; +} +else +{ + $section = $_GET['section']; +} + +$tabsheet = new tabsheet(); +foreach ($tabs as $tab) +{ + if ($tab['code'] == $section) + { + $selected_tab = $tab['code']; + $help_section_title = l10n($tab['label']); + } + + $tabsheet->add($tab['code'], l10n($tab['label']), $link.$tab['code']); +} +$tabsheet->select($selected_tab); +$tabsheet->assign(); + +$template->set_filenames(array('help' => 'help.tpl')); + +$template->assign( + array( + 'HELP_CONTENT' => load_language( + 'help/help_'.$selected_tab.'.html', + '', + array('return'=>true) + ), + 'HELP_SECTION_TITLE' => $help_section_title, + ) + ); + +// +-----------------------------------------------------------------------+ +// | sending html code | +// +-----------------------------------------------------------------------+ + +$template->assign_var_from_handle('ADMIN_CONTENT', 'help'); ?> diff --git a/admin/photos_add.php b/admin/photos_add.php index b076cdf29..27e55c696 100644 --- a/admin/photos_add.php +++ b/admin/photos_add.php @@ -147,7 +147,15 @@ $tabs = array( array( 'code' => 'settings', 'label' => 'Settings', - ) + ), + array( + 'code' => 'ploader', + 'label' => 'Piwigo Uploader', + ), + array( + 'code' => 'ftp', + 'label' => 'FTP + Synchronisation', + ), ); $tab_codes = array_map( diff --git a/admin/photos_add_ftp.php b/admin/photos_add_ftp.php new file mode 100644 index 000000000..53463d1f7 --- /dev/null +++ b/admin/photos_add_ftp.php @@ -0,0 +1,45 @@ +assign( + 'FTP_HELP_CONTENT', + load_language( + 'help/photos_add_ftp.html', + '', + array('return'=>true) + ) + ); + +// +-----------------------------------------------------------------------+ +// | sending html code | +// +-----------------------------------------------------------------------+ + +$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); +?> \ No newline at end of file diff --git a/admin/photos_add_ploader.php b/admin/photos_add_ploader.php new file mode 100644 index 000000000..5f38e13bb --- /dev/null +++ b/admin/photos_add_ploader.php @@ -0,0 +1,45 @@ +assign( + array( + 'URL_DOWNLOAD_WINDOWS' => $conf['ploader_download_windows'], + 'URL_DOWNLOAD_MAC' => $conf['ploader_download_mac'], + 'URL_DOWNLOAD_LINUX' => $conf['ploader_download_linux'], + ) + ); + + +// +-----------------------------------------------------------------------+ +// | sending html code | +// +-----------------------------------------------------------------------+ + +$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); +?> \ No newline at end of file diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 95c78562a..197c7c659 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -209,4 +209,7 @@ html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers #themesContent H3 {border-bottom:1px solid #aaa;} .themeDefault {background-color:#dbe8f3;} -#pluginsMenuSeparator {border:1px solid #ddd;} \ No newline at end of file +#pluginsMenuSeparator {border:1px solid #ddd;} + +#helpContent A {border-bottom:1px dotted #005E89;} +#helpContent A:hover {border-bottom:1px solid #d54e21;} \ No newline at end of file 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 @@
Hello {$USERNAME} : Visit Gallery | - Change Theme | + Change Admin Colors | + Help Me | {'Logout'|@translate} - (?)
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 @@ +

{'Help'|@translate} » {$HELP_SECTION_TITLE}

+ +
+ +{$HELP_CONTENT} + +
\ 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 @@ +
+

{'FTP + Synchronization'|@translate}

+
+ +
+{$FTP_HELP_CONTENT} +
\ 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} + + + +{/literal} + +
+

{'Piwigo Uploader'|@translate}

+
+ +
+

pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.

+ +
    +
  1. + Download, + + + + +
    + + +
    Windows +     +     		+ + + +
    Mac +     +     		+ + + +
    Linux +     +     		+
    + +
    2. +
  2. Install on your computer,
    3. +
  3. Start pLoader and add your photos.
    4. +
+
\ No newline at end of file diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 7a19b2be2..af9e47e2a 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -221,4 +221,6 @@ html>body #menubar {min-height:522px; height:522px;} /* IE 7 and modern browsers .themeActions A {border-bottom:none;} .themeDefault {background-color:#555;} -#pluginsMenuSeparator {border:1px solid #333;} \ No newline at end of file +#pluginsMenuSeparator {border:1px solid #333;} + +#helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;} \ No newline at end of file diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 00dadddf5..ec46e1861 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -771,4 +771,13 @@ $conf['no_photo_yet_url'] = 'admin.php?page=photos_add'; // directory with themes inside $conf['themes_dir'] = PHPWG_ROOT_PATH.'themes'; + +// pLoader direct download url for windows +$conf['ploader_download_windows'] = 'http://piwigo.org/ext/download.php?eid=270'; + +// pLoader direct download url for mac +$conf['ploader_download_mac'] = 'http://piwigo.org/ext/download.php?eid=353'; + +// pLoader direct download url for linux +$conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269'; ?> diff --git a/language/en_UK/help.html b/language/en_UK/help.html deleted file mode 100644 index 6b7effa15..000000000 --- a/language/en_UK/help.html +++ /dev/null @@ -1,310 +0,0 @@ -
-

Help

- -
-
- Add photos, the pLoader way -
- -
- -
-
- Add photos, the FTP way -
- -
- -
-
- Permissions -
- -
- -
-
- Groups -
- -
- -
-
- Upload by users -
- -
- - - -
-
- Miscellanous informations -
- -
- -
diff --git a/language/en_UK/help/help_add_photos.html b/language/en_UK/help/help_add_photos.html new file mode 100644 index 000000000..aac235cd4 --- /dev/null +++ b/language/en_UK/help/help_add_photos.html @@ -0,0 +1,29 @@ +

Several ways to add your photos in your gallery:

+ + + +

Go to Direct Upload

+ + + +

Go to pLoader

+ + + +

Go to FTP

diff --git a/language/en_UK/help/help_groups.html b/language/en_UK/help/help_groups.html new file mode 100644 index 000000000..22d995735 --- /dev/null +++ b/language/en_UK/help/help_groups.html @@ -0,0 +1,11 @@ +

Groups is a convenient way to set permissions for a list of users.

+ +

Create groups in Administration » Users +» Groups and associate users to this group +in Administration » Users » +Manage.

+ +

A user can belong to several groups. Authorization is stronger than +forbiddance : if user "jack" belongs to groups "family" and "friends", and +that only group "family" can see category "Christmas 2003" category then +"jack" will be able to see "Christmas 2003".

diff --git a/language/en_UK/help/help_misc.html b/language/en_UK/help/help_misc.html new file mode 100644 index 000000000..246beff10 --- /dev/null +++ b/language/en_UK/help/help_misc.html @@ -0,0 +1,7 @@ +

As soon as you created your gallery, modify default display properties +in Administration » Configuration » +Default. Every new registered user will use these default +configuration settings.

+ +

If you have any question, Piwigo community will welcome you +on its forum.

diff --git a/language/en_UK/help/help_permissions.html b/language/en_UK/help/help_permissions.html new file mode 100644 index 000000000..b4013e428 --- /dev/null +++ b/language/en_UK/help/help_permissions.html @@ -0,0 +1,24 @@ +

You can forbid access to categories. Switch the category access type to +"private" if you want to manage permissions.

+ +

You can set a category to private by editing a single category +(Administration » Categories » Manage +» edit) or by setting options to your whole category tree +(Administration » Categories » +Properties » Public / Private).

+ +

Once the category is private, you can manage permissions for groups and +users with 3 screens:

+ + diff --git a/language/en_UK/help/help_user_upload.html b/language/en_UK/help/help_user_upload.html new file mode 100644 index 000000000..5aea7af54 --- /dev/null +++ b/language/en_UK/help/help_user_upload.html @@ -0,0 +1,18 @@ +

Users can upload their photos too.

+ +
    + +
  1. Authorize upload on any physical categories + (Administration » Categories » Manage + » edit or Administration » + Categories » Properties » Upload). Virtual categories + can't receive any upload.
    2. + +
  2. Give write access on corresponding directories.
    3. + +
+ +

Photos uploaded by users are not directly visible on the website. An +administrator must validate uploaded photos +in Administration » Photos » +Waiting.

diff --git a/language/en_UK/help/help_virtual_links.html b/language/en_UK/help/help_virtual_links.html new file mode 100644 index 000000000..ac5e4dce1 --- /dev/null +++ b/language/en_UK/help/help_virtual_links.html @@ -0,0 +1,12 @@ +

Photos are displayed in the category corresponding to the file +directory.

+ +

You can also display a picture in several categories, without duplicating +the file on your web server. Associate the photo to any category from the +photo editing screen (that any administrator can reach from the photo page +on the gallery side).

+ +

Virtual categories are based on this concept: they have no corresponding +directory. Create virtual categories +from Administration » Categories » +Manage.

diff --git a/language/en_UK/help/photos_add_ftp.html b/language/en_UK/help/photos_add_ftp.html new file mode 100644 index 000000000..5bb2c552c --- /dev/null +++ b/language/en_UK/help/photos_add_ftp.html @@ -0,0 +1,112 @@ +
+ Quick Start + +
    +
  1. Create a directory on your computer.
    2. + +
  2. Copy some photos inside this directory, resize them for web display. Warning: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, no accentuated characters.
    3. + +
  3. With a FTP client, copy your directory in the "galleries" directory of your Piwigo installation.
    4. + +
  4. Logon your gallery and go to Administration » Pictures » Thumbnails to create missing thumbnails.
    5. + +
  5. Go to Administration and click on the big Synchronization button.
    6. +
+ +Congratulations! You have successfuly created the first category of your photo gallery. +
+ +
+ Directories and files organization + + +
+ +
+ Thumbnails + +
diff --git a/language/fr_FR/help.html b/language/fr_FR/help.html deleted file mode 100644 index f1b83b49c..000000000 --- a/language/fr_FR/help.html +++ /dev/null @@ -1,330 +0,0 @@ -
-

Aide

- -
-
- Ajouter des photos avec pLoader -
- -
- -
-
- Ajouter des photos par FTP -
- -
- -
-
- Permissions -
- -
- -
-
- Groupes d'utilisateurs -
- -
- -
-
- Ajout de fichiers par les utilisateurs -
- -
- - - -
-
- Informations diverses -
- -
- -
diff --git a/language/fr_FR/help/help_add_photos.html b/language/fr_FR/help/help_add_photos.html new file mode 100644 index 000000000..ef1d4a65e --- /dev/null +++ b/language/fr_FR/help/help_add_photos.html @@ -0,0 +1,32 @@ +

Plusieurs méthodes existent pour ajouter des photos dans votre +galerie :

+ + + +

Utiliser l'ajout direct

+ + + +

Utiliser pLoader

+ + + +

Utiliser FTP

diff --git a/language/fr_FR/help/help_groups.html b/language/fr_FR/help/help_groups.html new file mode 100644 index 000000000..20e727d74 --- /dev/null +++ b/language/fr_FR/help/help_groups.html @@ -0,0 +1,9 @@ +

Les groupes d'utilisateurs permettent d'assigner des permissions à une liste d'utilisateurs.

+ +

Vous pouvez créer des groupes et y ajouter des utilisateurs dans la +Administration » Utilisateurs » Groupes.

+ +

Un utilisateur peut appartenir à plusieurs groupes. L'autorisation est +plus forte que l'interdiction : si l'utilisateur "pierre" appartient aux +groupes "famille" et "amis", et que seul le groupe "famille" peut visiter la +catégorie "Noël 2003", alors "pierre" peut visiter cette catégorie.

diff --git a/language/fr_FR/help/help_misc.html b/language/fr_FR/help/help_misc.html new file mode 100644 index 000000000..9525ca807 --- /dev/null +++ b/language/fr_FR/help/help_misc.html @@ -0,0 +1,5 @@ +

Une fois votre galerie créée, configurez l'affichage par +défaut tel que désiré dans Administation » Configuration » Affichage par défaut. En effet, chaque nouvel +utilisateur héritera de ces propriétés d'affichage.

+ +

Pour tout question, la communauté francophone Piwigo est à l'écoute sur le forum.

diff --git a/language/fr_FR/help/help_permissions.html b/language/fr_FR/help/help_permissions.html new file mode 100644 index 000000000..6aa0bd59e --- /dev/null +++ b/language/fr_FR/help/help_permissions.html @@ -0,0 +1,15 @@ +

Vous pouvez interdire l'accès aux catégories. Passez le type d'accès à "privé" si vous souhaitez gérer les permissions.

+ +

Vous pouvez rendre une catégorie privée en l'éditant (Administration » Catégories » Gérer » Editer) ou en +gérant les options pour votre arbre complet des catégories (Administration » Catégories » Propriétés » Publique/Privée).

+ +

Une fois que certaines catégories sont privées, vous pouvez gérer les +permissions avec 3 écrans :

+ + diff --git a/language/fr_FR/help/help_user_upload.html b/language/fr_FR/help/help_user_upload.html new file mode 100644 index 000000000..bdf931041 --- /dev/null +++ b/language/fr_FR/help/help_user_upload.html @@ -0,0 +1,15 @@ +

Vos utilisateurs peuvent également ajouter leurs photos.

+ +
    + +
  1. Autorisez l'ajout d'images sur une ou plusieurs catégories (Administation » Catégories » Gestion » Edit ou Administration » Catégories » Propriétés » Ajout d'images). Les catégories virtuelles ne permettent pas l'ajout d'images.
    2. + +
  2. donner les droits en écriture (pour tous les utilisateurs) sur les +répertoires correspondant aux catégories qui sont autorisées à l'ajout.
    3. +
+ +

Les photos ajoutées par les utilisateurs ne sont pas directement +visibles sur le site, ils doivent être validés par un administrateur. Pour +cela, un administrateur doit se rendre dans Administration » Photos » En attente afin d'accepter ou de rejeter les photos proposées.

diff --git a/language/fr_FR/help/help_virtual_links.html b/language/fr_FR/help/help_virtual_links.html new file mode 100644 index 000000000..b2dcc174c --- /dev/null +++ b/language/fr_FR/help/help_virtual_links.html @@ -0,0 +1,5 @@ +

Les photos sont affichées dans les catégories correspondant aux répertoires.

+ +

Vous pouvez également afficher une photo dans plusieurs catégories, sans dupliquer le fichier sur votre serveur web. Associez la photo à n'importe quelle autre catégorie depuis l'écran d'édition de la photo (auquel vous accéder depuis la page de visualisation de la photo côté galerie, lorsque vous êtes connecté en tant qu'administrateur)

+ +

Les catégories virtuelles partent de ce principe : elles n'ont pas de répertoire associé. Créez des catégories virtuelles depuis Administration » Catégories » Gérer.

diff --git a/language/fr_FR/help/photos_add_ftp.html b/language/fr_FR/help/photos_add_ftp.html new file mode 100644 index 000000000..7995b2d4e --- /dev/null +++ b/language/fr_FR/help/photos_add_ftp.html @@ -0,0 +1,141 @@ +
+ Démarrage rapide + +
    +
  1. Créez un répertoire sur votre ordinateur.
    2. + +
  2. Copiez des photos à l'intérieur de ce répertoire, puis redimensionnez les pour un affichage sur le web. Attention : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères "-", "_" or ".". Pas d'espace ou de caractères accentués.
    3. + +
  3. Avec un client FTP, copiez le répertoire dans le répertoire "galleries" de votre installation de Piwigo.
    4. + +
  4. Connectez vous à votre installation de Piwigo et rendez vous sur Administration » Images » Miniatures pour créer les miniatures manquantes.
    5. + +
  5. Rendez vous sur Administration et cliquez sur le gros bouton de synchronisation.
    6. +
+ +

Bravo ! Vous avez créé avec succès la première catégorie de votre galerie.

+ +
+ +
+ Organisation des répertoires et des fichiers + + + +
+ +
+ Miniatures + +