From be37b1bef67f85d474ec18b85205062825fa9f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= Date: Fri, 18 Apr 2014 10:17:08 +0000 Subject: [PATCH] Publish FR doc in Manager (#648) --- Makefile | 24 +++++++++++-------- _example/etc/manager-apache.conf | 15 +++++++++--- _example/etc/manager-apache2.4.conf | 14 ++++++++--- _example/etc/manager-apache2.conf | 15 +++++++++--- debian/rules | 3 ++- lemonldap-ng-manager/MANIFEST | 1 + lemonldap-ng-manager/example/index.pl | 1 + lemonldap-ng-manager/example/notfoundfr.html | 10 ++++++++ .../example/skins/default/js/manager.js | 6 ++++- .../example/skins/default/manager.tpl | 5 ++-- 10 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 lemonldap-ng-manager/example/notfoundfr.html diff --git a/Makefile b/Makefile index 065cfbedd..713e0ccde 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,11 @@ MANAGERSKINSDIR=$(MANAGERDIR)/skins RMANAGERSKINSDIR=$(DESTDIR)/$(MANAGERSKINSDIR) SESSIONSEXPLORERDIR=$(MANAGERDIR) RSESSIONSEXPLORERDIR=$(DESTDIR)/$(SESSIONSEXPLORERDIR) -DOCDIR=$(DOCUMENTROOT)/doc +DOCDIR=$(DOCUMENTROOT) RDOCDIR=$(DESTDIR)/$(DOCDIR) +DEFDOCDIR=$(DOCUMENTROOT)/doc +RDEFDOCDIR=$(DESTDIR)/$(DEFDOCDIR) +FRDOCDIR=$(DOCUMENTROOT)/fr-doc TESTDIR=$(DOCUMENTROOT)/test RTESTDIR=$(DESTDIR)/$(TESTDIR) EXAMPLESDIR=$(LMPREFIX)/examples @@ -141,7 +144,7 @@ all: configure common handler manager portal @echo " - install_manager_site ($(MANAGERDIR))" @echo " - install_handler_site ($(HANDLERDIR))" @echo " * Documentation install :" - @echo " - install_doc_site ($(DOCDIR))" + @echo " - install_doc_site ($(DEFDOCDIR))" @echo " - install_examples_site ($(EXAMPLESDIR))" @echo @echo "Other languages documentation (fr only for now)" @@ -280,7 +283,8 @@ install_site: install_manager_site install_portal_site install_handler_site inst s#__MANAGERDIR__#$(MANAGERDIR)/#g; \ s#__TESTDIR__#$(TESTDIR)/#g; \ s#__VHOSTLISTEN__#$(VHOSTLISTEN)#g; \ - s#__DOCDIR__#$(DOCDIR)/#g;' $(RCONFDIR)/*apache*.conf + s#__DEFDOCDIR__#$(DEFDOCDIR)/#g; \ + s#__FRDOCDIR__#$(FRDOCDIR)/#g;' $(RCONFDIR)/*apache*.conf @$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)/for_etc_hosts # Fix a lost of rights on the main directory @chmod 755 $(RBINDIR) $(RDOCUMENTROOT) $(REXAMPLESDIR) $(RHANDLERDIR) $(RPORTALSKINSDIR) $(RMANAGERSKINSDIR) $(RTOOLSDIR) $(RCONFDIR) $(RDATADIR) @@ -325,7 +329,7 @@ install_manager_site: install_conf_dir install -v -d $(RMANAGERSKINSDIR)/$$skin; \ done @cp -pR --remove-destination ${SRCMANAGERDIR}/example/index.pl ${RMANAGERDIR} - @cp -pR --remove-destination ${SRCMANAGERDIR}/example/notfound.html ${RMANAGERDIR} + @cp -pR --remove-destination ${SRCMANAGERDIR}/example/*.html ${RMANAGERDIR} @cp -pR --remove-destination ${SRCMANAGERDIR}/example/skins/* $(RMANAGERSKINSDIR) @if [ "$(MANAGERDIR)/skins/" != "$(MANAGERSKINSDIR)/" ]; then \ for skin in $$(ls lemonldap-ng-manager/example/skins/); do \ @@ -412,9 +416,9 @@ install_examples_site: install_doc_site: # Offline documentation install - @rm -rf $(RDOCDIR) - @install -v -d $(RDOCDIR) - @cp -dR --remove-destination doc/* $(RDOCDIR) + @rm -rf $(RDEFDOCDIR) + @install -v -d $(RDEFDOCDIR) + @cp -dR --remove-destination doc/* $(RDEFDOCDIR) install_conf_dir: install_sessions_dir install_notif_dir install_captcha_dir # Configuration files install @@ -746,7 +750,7 @@ omegat-clean: rm -rf omegat.files/*/omegat.project po-doc/*/* omegat.files/*/omegat/project_save*.bak install_%_doc_site: %-doc test_omegat_%_dir - @rm -rf $(RDOCDIR)/$* || true - @install -v -d $(RDOCDIR)/$* - @cp -dR --remove-destination po-doc/$*/* $(RDOCDIR)/$* + @rm -rf $(RDOCDIR)/$*-doc || true + @install -v -d $(RDOCDIR)/$*-doc + @cp -dR --remove-destination po-doc/$*/* $(RDOCDIR)/$*-doc diff --git a/_example/etc/manager-apache.conf b/_example/etc/manager-apache.conf index 8e290c6b4..64d070b4e 100644 --- a/_example/etc/manager-apache.conf +++ b/_example/etc/manager-apache.conf @@ -18,15 +18,24 @@ # On-line documentation - Alias /doc/ __DOCDIR__ - Alias /lib/ __DOCDIR__lib/ - + Alias /doc/ __DEFDOCDIR__ + Alias /lib/ __DEFDOCDIR__lib/ + Order allow,deny Allow from all ErrorDocument 404 /notfound.html Options +FollowSymLinks + # French version (needs fr-doc installation) + Alias /fr-doc/ __FRDOCDIR__ + + Order deny,allow + Allow from all + ErrorDocument 404 /notfoundfr.html + Options +FollowSymLinks + + # Perl script # Note: to avoid manager stay in memory, we don't use ModPerl::Registry # by default. Change this to increase manager performances diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf index 2714b23f9..5e7ca7ab6 100644 --- a/_example/etc/manager-apache2.4.conf +++ b/_example/etc/manager-apache2.4.conf @@ -17,14 +17,22 @@ # On-line documentation - Alias /doc/ __DOCDIR__ - Alias /lib/ __DOCDIR__lib/ - + Alias /doc/ __DEFDOCDIR__ + Alias /lib/ __DEFDOCDIR__lib/ + Require all granted ErrorDocument 404 /notfound.html Options +FollowSymLinks + # French version (needs fr-doc installation) + Alias /fr-doc/ __FRDOCDIR__ + + Require all granted + ErrorDocument 404 /notfoundfr.html + Options +FollowSymLinks + + # Perl script # Note: to avoid manager stay in memory, we don't use ModPerl::Registry # by default. Change this to increase manager performances diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf index f8d7ea763..a5bc7ad16 100644 --- a/_example/etc/manager-apache2.conf +++ b/_example/etc/manager-apache2.conf @@ -18,15 +18,24 @@ # On-line documentation - Alias /doc/ __DOCDIR__ - Alias /lib/ __DOCDIR__lib/ - + Alias /doc/ __DEFDOCDIR__ + Alias /lib/ __DEFDOCDIR__lib/ + Order allow,deny Allow from all ErrorDocument 404 /notfound.html Options +FollowSymLinks + # French version (needs fr-doc installation) + Alias /fr-doc/ __FRDOCDIR__ + + Order deny,allow + Allow from all + ErrorDocument 404 /notfoundfr.html + Options +FollowSymLinks + + # Perl script # Note: to avoid manager stay in memory, we don't use ModPerl::Registry # by default. Change this to increase manager performances diff --git a/debian/rules b/debian/rules index 8ea952445..c0e5962e5 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,8 @@ override_dh_auto_install: DATADIR=$(LMVARDIR) \ APACHEUSER=www-data \ APACHEGROUP=www-data \ - DOCDIR=/usr/share/doc/lemonldap-ng-doc + DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \ + FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc $(MAKE) fr-doc test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js') test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css') diff --git a/lemonldap-ng-manager/MANIFEST b/lemonldap-ng-manager/MANIFEST index b779ee78e..08c771ffe 100644 --- a/lemonldap-ng-manager/MANIFEST +++ b/lemonldap-ng-manager/MANIFEST @@ -3,6 +3,7 @@ example/index.pl example/mrtg/lmng-mrtg example/mrtg/mrtg.cfg.example example/notfound.html +example/notfoundfr.html example/notifications.pl example/scripts/lemonldap-ng-cli example/scripts/lmConfigEditor diff --git a/lemonldap-ng-manager/example/index.pl b/lemonldap-ng-manager/example/index.pl index 71a0bc3e3..febce7534 100755 --- a/lemonldap-ng-manager/example/index.pl +++ b/lemonldap-ng-manager/example/index.pl @@ -44,6 +44,7 @@ $template->param( TREE_JQUERYCSS => $manager->{managerTreeJqueryCss} ); $template->param( CSS => $manager->{managerCss} ); $template->param( CSS_THEME => $manager->{managerCssTheme} ); $template->param( VERSION => $Lemonldap::NG::Manager::VERSION ); +$template->param( LANG => shift $manager->{lang} ); print $manager->header('text/html; charset=utf-8'); print $template->output; diff --git a/lemonldap-ng-manager/example/notfoundfr.html b/lemonldap-ng-manager/example/notfoundfr.html new file mode 100644 index 000000000..c0ece5af9 --- /dev/null +++ b/lemonldap-ng-manager/example/notfoundfr.html @@ -0,0 +1,10 @@ + + + +Page non trouvée + + +

Page non trouvée

+

Merci d'installer le paquet contenant la documentation française

+ + diff --git a/lemonldap-ng-manager/example/skins/default/js/manager.js b/lemonldap-ng-manager/example/skins/default/js/manager.js index 37f4e8933..19c31c08c 100644 --- a/lemonldap-ng-manager/example/skins/default/js/manager.js +++ b/lemonldap-ng-manager/example/skins/default/js/manager.js @@ -1669,7 +1669,11 @@ function loadHelp(ch) { } // Display new help only if not the last help if (ch != lasthelp) { - url = '/doc' + helpCh[ch]; + if (lang == "fr") { + url = '/fr-doc' + helpCh[ch]; + } else { + url = '/doc' + helpCh[ch]; + } var html = '