Author: bleny Date: 2014-02-28 17:10:56 +0100 (Fri, 28 Feb 2014) New Revision: 1703 Url: http://codelutin.com/projects/wao/repository/revisions/1703 Log: use s:text everywhere Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -16,11 +16,11 @@ <div class="form-actions"> <s:url action="news" id="newsUrl" /> <s:a href="%{newsUrl}" cssClass="btn"> - <i class="icon-chevron-left"></i> <s:property value="getText('wao.ui.action.cancel')" /> + <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel" /> </s:a> <s:submit type="button" cssClass="btn"> - <i class="icon-ok"></i> <s:property value="getText('wao.ui.action.save')" /> + <i class="icon-ok"></i> <s:text name="wao.ui.action.save" /> </s:submit> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -35,14 +35,14 @@ <s:param name="newsId" value="topiaId" /> </s:url> <s:a href="%{editNewsUrl}"> - <i class="icon-edit"></i> <s:property value="getText('wao.ui.action.edit')" /> + <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> </s:a> <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> <s:a href="%{deleteNewsUrl}"> - <i class="icon-trash"></i> <s:property value="getText('wao.ui.action.delete')" /> + <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> </s:a> </p> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -29,45 +29,45 @@ <li class="active"> <s:url action="news" id="newsUrl" /> <s:a href="%{newsUrl}"> - <s:property value="getText('wao.ui.page.Index.title')" /> + <s:text name="wao.ui.page.Index.title" /> </s:a> </li> <li> <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}"> - <s:property value="getText('wao.ui.page.SamplingPlan.title')" /> + <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> <li> <s:url action="boats" id="boatsUrl" /> <s:a href="%{boatsUrl}"> - <s:property value="getText('wao.ui.page.Boats.title')" /> + <s:text name="wao.ui.page.Boats.title" /> </s:a> </li> <li> <s:url action="contacts" id="contactsUrl" /> <s:a href="%{contactsUrl}"> - <s:property value="getText('wao.ui.page.Contacts.title')" /> + <s:text name="wao.ui.page.Contacts.title" /> </s:a> </li> <li> <s:url action="synthesis" id="synthesisUrl" /> <s:a href="%{synthesisUrl}"> - <s:property value="getText('wao.ui.page.Synthesis.title')" /> + <s:text name="wao.ui.page.Synthesis.title" /> </s:a> </li> </ul> <ul class="nav pull-right"> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <s:property value="getText('wao.ui.page.Administration.title')" /> + <s:text name="wao.ui.page.Administration.title" /> <b class="caret"></b> </a> <ul class="dropdown-menu"> <li> <s:url namespace="/administration" action="referential-management" id="referentialManagementUrl" /> <s:a href="%{referentialManagementUrl}"> - <i class="icon-upload"></i> <s:property value="getText('wao.ui.page.ReferentialManagement.title')" /> + <i class="icon-upload"></i> <s:text name="wao.ui.page.ReferentialManagement.title" /> </s:a> </li> </ul> @@ -90,14 +90,14 @@ </s:param> </s:url> <s:a href="%{changeLocaleUrl}"> - <i class="icon-flag"></i> <s:property value="getText('wao.ui.action.changeLocale')" /> + <i class="icon-flag"></i> <s:text name="wao.ui.action.changeLocale" /> </s:a> </li> <li> - <a href="#"><i class="icon-user"></i> <s:property value="getText('wao.ui.page.UserProfileForm.title')" /></a> + <a href="#"><i class="icon-user"></i> <s:text name="wao.ui.page.UserProfileForm.title" /></a> </li> <li> - <a href="#"><i class="icon-off"></i> <s:property value="getText('wao.ui.action.logout')" /></a> + <a href="#"><i class="icon-off"></i> <s:text name="wao.ui.action.logout" /></a> </li> </ul> </li> @@ -149,7 +149,7 @@ </ul> <s:if test="obsMer"> <small class="cnil"> - <s:property value="getText('wao.ui.disclaimer')" /> + <s:text name="wao.ui.disclaimer" /> </small> </s:if> </footer>