Author: bleny Date: 2014-02-25 12:08:18 +0100 (Tue, 25 Feb 2014) New Revision: 1680 Url: http://codelutin.com/projects/wao/repository/revisions/1680 Log: layout, disable shiro, use LegacyTopiaIdFactory Modified: trunk/wao-persistence/src/main/resources/wao.properties trunk/wao-web/src/main/resources/shiro.ini trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-02-25 11:08:18 UTC (rev 1680) @@ -15,3 +15,5 @@ hibernate.c3p0.max_statements=50 # hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider + +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory Modified: trunk/wao-web/src/main/resources/shiro.ini =================================================================== --- trunk/wao-web/src/main/resources/shiro.ini 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-web/src/main/resources/shiro.ini 2014-02-25 11:08:18 UTC (rev 1680) @@ -34,4 +34,8 @@ /struts/bootstrap/** = anon # pour tout le reste, il faut être authentifié -/** = authc +#/** = authc + +# on désactive shiro + +/** = anon Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-25 11:08:18 UTC (rev 1680) @@ -21,12 +21,74 @@ <body> - <header> - Plan d'échantillonnage - Contacts - Synthèses - </header> + <div class="navbar"> + <div class="navbar-inner"> + <a class="brand" href="#">Wao Obs???</a> + <ul class="nav"> + <li class="active"> + <s:url action="news" id="newsUrl" /> + <s:a href="%{newsUrl}" title="Consulter les actualités"> + Actualités + </s:a> + </li> + <li> + <s:url action="sampling-plan" id="samplingPlanUrl" /> + <s:a href="%{samplingPlanUrl}" title="Consulter le plan d'échantillonnage"> + Plan d'échantillonnage + </s:a> + </li> + <li> + <s:url action="boats" id="boatsUrl" /> + <s:a href="%{boatsUrl}" title="Consulter le référentiel de navires et créer des contacts"> + Navires + </s:a> + </li> + <li> + <s:url action="contacts" id="contactsUrl" /> + <s:a href="%{contactsUrl}" title="Consulter les contacts"> + Contacts + </s:a> + </li> + <li> + <s:url action="synthesis" id="synthesisUrl" /> + <s:a href="%{synthesisUrl}" title="Consulter les synthèses"> + Synthèses + </s:a> + </li> + </ul> + <ul class="nav pull-right"> + <li> + <s:url action="administration" id="administrationUrl" /> + <s:a href="%{administrationUrl}" title="Accèder à la partie administration"> + Administration + </s:a> + </li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + <i class="icon-cog"></i> + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li> + <a href="#"><i class="icon-flag"></i> Switch to english version</a> + </li> + <li> + <a href="#"><i class="icon-flag"></i> Basculer vers la version française</a> + </li> + <li class="divider" /> + <li> + <a href="#"><i class="icon-user"></i> Modifier votre profil</a> + </li> + <li> + <a href="#"><i class="icon-off"></i> Se déconnecter</a> + </li> + </ul> + </li> + </ul> + </div> + </div> + <content> <s:actionerror theme="bootstrap" /> <s:actionmessage theme="bootstrap" /> @@ -75,7 +137,7 @@ </ul> <t:if test="connectedUser.obsMer"> <p class="cnil"> - ${message:wao.ui.disclaimer} + <s:property value="text('wao.ui.disclaimer')" /> </p> </t:if> </footer>