Author: lkaufmann Date: 2014-05-15 15:28:50 +0200 (Thu, 15 May 2014) New Revision: 1941 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1941 Log: Refs #4997 Add fixed icons for sampling plans table 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/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.css 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-05-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-05-15 13:28:50 UTC (rev 1941) @@ -37,6 +37,7 @@ }); }); </script> + <content tag="mainClass">news</content> </head> 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-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-15 13:28:50 UTC (rev 1941) @@ -156,23 +156,28 @@ </div> </s:form> - - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> - <span class="only-in-compact-view"> - <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToFullView" /> - </span> - <span class="only-in-full-view"> - <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToCompactView" /> - </span> - </button> - - <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <button type="button" id="switch-estimated-real" class="btn show-estimated"> - <i class="icon-adjust"></i> - <span class="estimated"><s:text name="wao.ui.action.viewReal" /></span> - <span class="real"><s:text name="wao.ui.action.viewEstimated" /></span> + + <div class="sticky-buttons"> + <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <span class="only-in-compact-view"> + <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> + </span> + <span class="only-in-full-view"> + <i class="fa fa-compress"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToCompactView" /></span> + </span> </button> - </s:if> + + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <button type="button" id="switch-estimated-real" class="btn show-estimated"> + <span class="estimated"> + <i class="fa fa-adjust"></i><span class="only-on-hover"> <s:text name="wao.ui.action.viewReal" /></span> + </span> + <span class="real"> + <i class="fa fa-adjust"></i><span class="only-on-hover"> <s:text name="wao.ui.action.viewEstimated" /></span> + </span> + </button> + </s:if> + </div> <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> <s:url action="edit-sample-row!input" id="createSampleRow" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 13:28:50 UTC (rev 1941) @@ -153,7 +153,8 @@ max-width: 100%; } -main.home { +main.home, +main.news { background-color:#efefef; max-width: 100%; } @@ -184,10 +185,9 @@ color: #00b2b2; display: block; float: left; - font-size: 30px; + font-size: 27px; font-weight: 200; - margin-left: -20px; - padding: 10px 20px; + padding: 9px 40px; font-family: 'Roboto', sans-serif; font-weight:bold; text-decoration: none; @@ -288,8 +288,9 @@ padding: 2px; } .large-table thead th { - border: 1px solid #CCCCCC; - color: #4A4A4A; + border: 1px solid #666; + color: #EEE; + background-color: #888; padding: 10px 0; } @@ -300,7 +301,7 @@ } .large-table thead th.firstline { - color: #2F4F4F; + color: #b2f0b2; letter-spacing: 0.5px; text-transform: uppercase; } @@ -352,7 +353,7 @@ } /** - * Les bouttons + * Les boutons */ button.#sampling-plan-filters-form_0 { font-family: Arial, Helvetica, sans-serif; @@ -388,6 +389,29 @@ background-color: #007070; } +.sticky-buttons { + position: fixed; + left: 20px; + bottom: 20px; +} +.sticky-buttons button.btn { + background: rgba(0,0,0,0.45); + color: #FFF; + outline: none; +} +.sticky-buttons button.btn:hover { + background: rgba(0,0,0,0.65); +} +.sticky-buttons button.btn i.fa { + font-size: 18px; +} +.sticky-buttons button.btn .only-on-hover { + display: none; +} +.sticky-buttons button.btn:hover .only-on-hover { + display: inherit; +} + /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli *****************************************************************************/ @@ -584,3 +608,27 @@ main.home .buttons-area a { float: right; } + +/** + * News edition + */ +main.news form { + background-color: #FFF; + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + border-bottom: 1px solid #EEE; + margin: 0 auto; + max-width: 968px; + padding-top: 40px; +} + +main.news form .control-group { + padding: 0 20px; +} + +main.news form .form-actions { + margin: 20px 0 0 0; +} +main.news form .form-actions button.btn { + float: right; +}