Author: bleny Date: 2014-05-22 11:53:30 +0200 (Thu, 22 May 2014) New Revision: 1974 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1974 Log: refs #4553 move create news button to admin menu Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 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-05-20 15:47:47 UTC (rev 1973) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-22 09:53:30 UTC (rev 1974) @@ -30,14 +30,19 @@ </head> <content tag="mainClass">home</content> - - <div class="buttons-area clearfix"> - <s:if test="authenticatedWaoUser.authorizedToCreateNews"> - <s:url action="edit-news!input" id="createNewsUrl" /> - <s:a href="%{createNewsUrl}" cssClass="btn btn-primary"> - <i class="fa fa-plus-square"></i> <s:text name="wao.ui.action.createNews" /> - </s:a> - </s:if> + + <s:if test="authenticatedWaoUser.authorizedToCreateNews"> + <content tag="administrationMenuOtherOptions"> + <li> + <s:url action="edit-news!input" id="createNewsUrl"/> + <s:a href="%{createNewsUrl}"> + <i class="fa fa-plus-square"></i> <s:text name="wao.ui.action.createNews"/> + </s:a> + </li> + </content> + </s:if> + + <div class="buttons-area"> </div> <s:iterator value="recentNews" var="aRecentNews"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-20 15:47:47 UTC (rev 1973) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-22 09:53:30 UTC (rev 1974) @@ -101,16 +101,14 @@ <content tag="samplingPlanMenuItemClass">active</content> <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> - <s:url action="edit-sample-row!input" id="createSampleRow" /> - <content tag="additionnalLinks"> + <content tag="administrationMenuOtherOptions"> <li> - <s:a href="%{createSampleRow}"> - <i class="icon-plus"></i> <s:text name="wao.ui.action.createSampleRow" /> + <s:url action="edit-sample-row!input" id="createSampleRow"/> + <s:a href="%{createSampleRow}"> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createSampleRow"/> </s:a> </li> </content> - - </s:if> <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-20 15:47:47 UTC (rev 1973) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-22 09:53:30 UTC (rev 1974) @@ -94,7 +94,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <decorator:getProperty property="page.additionnalLinks"/> + <decorator:getProperty property="page.administrationMenuOtherOptions"/> <s:if test="authenticatedWaoUser.authorizedToImportSamplingPlan"> <li>