Author: bpoussin Date: 2013-06-30 00:54:31 +0200 (Sun, 30 Jun 2013) New Revision: 353 Url: http://chorem.org/projects/chorem/repository/revisions/353 Log: essai de minimisation de la taille du menu Financial Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/css/chorem.less Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-28 14:53:52 UTC (rev 352) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-29 22:54:31 UTC (rev 353) @@ -144,22 +144,23 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li>Projected</li> - <li><a href="<c:url value="/wikitty/Quotation/search"/>"><i class="icon-th-list icon-black"></i> All quotations</a></li> - <li><a href="<c:url value="/wikitty/Quotation/edit/new"/>"><i class="icon-plus icon-black"></i> Add quotation</a></li> + <li> + <a href="<c:url value="/wikitty/Quotation/search"/>"><i class="icon-th-list icon-black"></i>Quotations</a> + <a href="<c:url value="/wikitty/Quotation/edit/new"/>"><i class="icon-plus icon-black"></i></a> + </li> + <li> + <a href="<c:url value="/wikitty/FinancialTransaction/search"/>"><i class="icon-th-list icon-black"></i>FinancialTransaction</a> + <a href="<c:url value="/wikitty/FinancialTransaction/edit/new"/>"><i class="icon-plus icon-black"></i></a> + </li> + <li> + <a href="<c:url value="/wikitty/Invoice/search"/>"><i class="icon-th-list icon-black"></i>Invoices</a> + <a href="<c:url value="/wikitty/Invoice/edit/new"/>"><i class="icon-plus icon-black"></i></a> + </li> + <li> + <a href="<c:url value="/wikitty/Category/search"/>"><i class="icon-th-list icon-black"></i>Categories</a> + <a href="<c:url value="/wikitty/Category/edit/new"/>"><i class="icon-plus icon-black"></i></a> + </li> <li class="divider"></li> - <li>FinancialTransaction</li> - <li><a href="<c:url value="/wikitty/FinancialTransaction/search"/>"><i class="icon-th-list icon-black"></i> All financial transactions</a></li> - <li><a href="<c:url value="/wikitty/FinancialTransaction/edit/new"/>"><i class="icon-plus icon-black"></i> Add financial transactions</a></li> - <li class="divider"></li> - <li>Invoice</li> - <li><a href="<c:url value="/wikitty/Invoice/search"/>"><i class="icon-th-list icon-black"></i> All invoices</a></li> - <li><a href="<c:url value="/wikitty/Invoice/edit/new"/>"><i class="icon-plus icon-black"></i> Add invoice</a></li> - <li class="divider"></li> - <li>Category</li> - <li><a href="<c:url value="/wikitty/Category/search"/>"><i class="icon-th-list icon-black"></i> All categories</a></li> - <li><a href="<c:url value="/wikitty/Category/edit/new"/>"><i class="icon-plus icon-black"></i> Add category</a></li> - <li class="divider"></li> <li>Report</li> <li><a href="<c:url value="/report?report=vat"/>">TVA mensuel</a></li> <li><a href="<c:url value="/report?report=invoiceDebt"/>">Debt</a></li> Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem.less =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2013-06-28 14:53:52 UTC (rev 352) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2013-06-29 22:54:31 UTC (rev 353) @@ -13,6 +13,11 @@ padding: 0px; } +/* Pour que les menus avec un + soit sur une seul ligne */ +.dropdown-menu li > a { + display: inline; +} + .ui-autocomplete { max-height: 250px; max-width: 500px;