From: Guillaume Pellerin Date: Wed, 7 Sep 2016 14:01:40 +0000 (+0200) Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3ca4ee0e957982e73f81ebf8179ccffe746159a4;p=mezzo.git Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev --- 3ca4ee0e957982e73f81ebf8179ccffe746159a4 diff --cc app/local_settings.py index 92348931,b6ce6e5d..c1f9e86a --- a/app/local_settings.py +++ b/app/local_settings.py @@@ -69,12 -69,12 +69,12 @@@ SITE_TAGLINE = 'Institut de Recherche e SILENCED_SYSTEM_CHECKS = ['fields.W342',] ADMIN_MENU_ORDER = ( - (_('Pages'), ('pages.Page', 'organization-pages.Home')), + (_('Pages'), ('pages.Page', 'organization-pages.Home', 'organization-pages.JobOffer')), (_('Media'), ('organization-media.Video', 'organization-media.VideoCategory', 'organization-media.Audio', 'organization-media.Playlist', (_('Media Library'), 'fb_browse'),)), - (_('Events'), ('mezzanine_agenda.Event', 'mezzanine_agenda.EventLocation', 'mezzanine_agenda.EventPrice',)), + (_('Events'), ('mezzanine_agenda.Event', 'mezzanine_agenda.EventLocation', 'mezzanine_agenda.EventPrice', 'mezzanine_agenda.EventCategory')), (_('Magazine'), ('organization-magazine.Article', 'organization-magazine.Brief',)), (_('Network'), ('organization-network.Organization', 'organization-network.Department', 'organization-network.Team', 'organization-network.Person', 'organization-network.Activity', 'organization-network.OrganizationType',)), - (_('Projects'), ('organization-projects.Project',)), + (_('Projects'), ('organization-projects.Project','organization-projects.ProjectProgram', 'organization-projects.ProjectProgramType' )), (_('Festival'), ('organization-festival.Artist',)), (_('Users'), ('auth.User', 'auth.Group',)), (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),