Author: bleny Date: 2014-03-25 12:53:28 +0100 (Tue, 25 Mar 2014) New Revision: 1744 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1744 Log: refs #4483 use dropdown menu for actions in sampling plan Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css 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-03-25 11:39:50 UTC (rev 1743) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-25 11:53:28 UTC (rev 1744) @@ -61,65 +61,66 @@ <s:property value="code" /> </th> <td class="actions"> - <%-- - <td class="actions dropdown"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><s:text name="wao.ui.actions" /> <b class="caret"></b></a> - <ul class="dropdown-menu"> - --%> - <ul> - <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <div class="dropdown"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <s:text name="wao.ui.actions" /> + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <li> + <s:url action="edit-sample-row!input" id="editSampleRowUrl"> + <s:param name="sampleRowId" value="topiaId" /> + </s:url> + <s:a href="%{editSampleRowUrl}"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + </s:a> + </li> + <li> + <s:url action="delete-sample-row" id="deleteSampleRowUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{deleteSampleRowUrl}"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> + </s:a> + </li> + </s:if> <li> - <s:url action="edit-sample-row!input" id="editSampleRowUrl"> + <s:url action="sample-row-log" id="sampleRowLogUrl"> <s:param name="sampleRowId" value="topiaId" /> </s:url> - <s:a href="%{editSampleRowUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + <s:a href="%{sampleRowLogUrl}"> + <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> </s:a> </li> <li> - <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="companyId" value="topiaId" /> + <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:param name="sampleRowIds" value="topiaId" /> </s:url> - <s:a href="%{deleteSampleRowUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> + <s:a href="%{viewElligibleBoatsUrl}"> + <s:text name="wao.ui.action.viewElligibleBoats" /> </s:a> </li> - </s:if> - <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="topiaId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> - <s:param name="sampleRowIds" value="topiaId" /> - </s:url> - <s:a href="%{viewElligibleBoatsUrl}"> - <s:text name="wao.ui.action.viewElligibleBoats" /> - </s:a> - </li> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="sampleRowIds" value="topiaId" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> - <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <li> - <s:url action="contacts" id="createAssociatedContactUrl"> + <s:url action="contacts" id="viewAssociatedContactsUrl"> <s:param name="sampleRowIds" value="topiaId" /> </s:url> - <s:a href="%{createAssociatedContactUrl}"> - <i class="icon-add"></i> <s:text name="wao.ui.action.createAssociatedContact" /> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> - </s:if> - </ul> + <s:if test="authenticatedWaoUser.authorizedToCreateContact"> + <li> + <s:url action="contacts" id="createAssociatedContactUrl"> + <s:param name="sampleRowIds" value="topiaId" /> + </s:url> + <s:a href="%{createAssociatedContactUrl}"> + <i class="icon-add"></i> <s:text name="wao.ui.action.createAssociatedContact" /> + </s:a> + </li> + </s:if> + </ul> + </div> </td> </tr> </s:iterator> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-25 11:39:50 UTC (rev 1743) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-25 11:53:28 UTC (rev 1744) @@ -18,7 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ + /** + * Personnalisation de Bootstrap + */ + +/* On surcharge left: 0px par left: 0% car ça pose problème pour Firefox qui place le menu complètement à gauche de la fenêtre et pas en dessous du bouton */ +.dropdown-menu { + left: 0%; +} + +/** * Le style du layout */ @@ -85,11 +95,6 @@ border: solid 1px #aaaaaa; } -.large-table * { - padding: 0px; - margin: 0px; -} - .large-table li { list-style-type: none; }