This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit f4bee9f8559e08665a402537448d76014029011e Merge: e95c74a c5572fb Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 16 14:20:34 2015 +0100 merge with develop .../ifremer/coselmar/beans/QuestionSearchBean.java | 19 +++ .../persistence/entity/QuestionTopiaDao.java | 47 +++++-- .../coselmar/converter/BeanEntityConverter.java | 8 -- .../services/CoselmarWebServiceSupport.java | 20 ++- .../coselmar/services/v1/DocumentsWebService.java | 7 +- .../coselmar/services/v1/QuestionsWebService.java | 63 +++++----- .../coselmar/services/v1/UsersWebService.java | 5 +- .../coselmar/services/UsersWebServiceTest.java | 5 +- coselmar-ui/pom.xml | 2 - coselmar-ui/src/main/webapp/css/coselmar.css | 74 ++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 4 + coselmar-ui/src/main/webapp/i18n/fr.js | 4 + coselmar-ui/src/main/webapp/index.html | 36 +++--- .../src/main/webapp/js/coselmar-controllers.js | 40 +++++- coselmar-ui/src/main/webapp/js/coselmar.js | 1 + .../webapp/views/documents/modalDocumentEdit.html | 138 +++++++++++---------- coselmar-ui/src/main/webapp/views/home.html | 59 ++++++++- .../main/webapp/views/questions/editquestion.html | 4 +- .../src/main/webapp/views/questions/questions.html | 7 +- .../src/main/webapp/views/users/edituser.html | 20 ++- pom.xml | 52 +++++--- 21 files changed, 431 insertions(+), 184 deletions(-) diff --cc coselmar-ui/src/main/webapp/css/coselmar.css index 746f42c,f43e553..71b86fe --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@@ -430,66 -437,64 +437,129 @@@ input[type="file"] height: auto; } + + /* Media queries + -------------------------------------------------- */ + + @media screen and (max-width: 1080px) { + body .container { + width: 90%; + } + + + .navbar .navbar-brand .logo { + height: 30px; + padding-top: 3px; + } + .navbar .navbar-brand span.title { + font-size: 11px; + } + .navbar .navbar-nav > li > a { + padding-left: 6px; + padding-right: 6px; + } + } + + @media screen and (max-width: 900px) { + .navbar .navbar-brand { + padding-right: 5px; + } + .navbar .navbar-nav > li > a { + padding-left: 3px; + padding-right: 3px; + } + .navbar .navbar-nav > li { + border-color: #ddd; + } + .navbar .navbar-nav > li:last-child { + border-color: #ddd; + } + .navbar .navbar-form.navbar-right .user-info { + font-size: 12px; + } + .navbar .navbar-form .btn { + font-size: 11px; + margin: 0 0 0 5px; + } + } + + @media screen and (min-width: 769px) and (max-width: 900px) { + .navbar .navbar-brand .logo { + display: block; + float: none; + height: 24px; + padding-top: 0; + } + .navbar .navbar-brand span.title { + display: block; + float: left; + font-size: 11px; + padding: 4px 0 0; + transform: none; + } ++} ++ ++ +/** + * Animation + */ +/* + We're using CSS transitions for when + the enter and move events are triggered + for the element that has the .repeated-item + class +*/ +.repeated-item.ng-enter, .repeated-item.ng-move { + -webkit-transition:0.5s linear all; + -moz-transition:0.5s linear all; + -o-transition:0.5s linear all; + transition:0.5s linear all; + opacity:0; +} + +/* + The ng-enter-active and ng-move-active + are where the transition destination properties + are set so that the animation knows what to + animate. +*/ +.repeated-item.ng-enter.ng-enter-active, +.repeated-item.ng-move.ng-move-active { + opacity:1; +} + +/* + We're using CSS keyframe animations for when + the leave event is triggered for the element + that has the .repeated-item class +*/ +.repeated-item.ng-leave { + -webkit-animation:0.5s my_animation; + -moz-animation:0.5s my_animation; + -o-animation:0.5s my_animation; + animation:0.5s my_animation; +} + +@keyframes my_animation { + from { opacity:1; } + to { opacity:0; } +} + +/* + Unfortunately each browser vendor requires + its own definition of keyframe animation code... +*/ +@-webkit-keyframes my_animation { + from { opacity:1; } + to { opacity:0; } +} + +@-moz-keyframes my_animation { + from { opacity:1; } + to { opacity:0; } +} + +@-o-keyframes my_animation { + from { opacity:1; } + to { opacity:0; } } diff --cc coselmar-ui/src/main/webapp/index.html index adecda5,2439101..9c20739 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@@ -25,25 -25,25 +25,26 @@@ <head> <meta charset="utf-8" /> - - <link rel="stylesheet" href="webjars/bootstrap/3.3.1/css/bootstrap.css"> - <link rel="stylesheet" href="webjars/font-awesome/4.2.0/css/font-awesome.css"> + <title>Coselmar {{ 'application.title' | translate}}</title> + + <link rel="stylesheet" href="webjars/bootstrap/3.3.2/css/bootstrap.css"> + <link rel="stylesheet" href="webjars/font-awesome/4.3.0/css/font-awesome.css"> <link rel="stylesheet" href="css/coselmar.css"> - <script src="webjars/jquery/2.1.1/jquery.js"></script> - <script src="webjars/angularjs/1.3.6/angular.js"></script> - <script src="webjars/angularjs/1.3.6/angular-route.js"></script> - <script src="webjars/angularjs/1.3.6/angular-resource.js"></script> - <script src="webjars/angularjs/1.3.6/angular-messages.js"></script> - <script src="webjars/angularjs/1.3.6/angular-animate.js"></script> + <script src="webjars/jquery/2.1.3/jquery.js"></script> + <script src="webjars/angularjs/1.3.13/angular.js"></script> + <script src="webjars/angularjs/1.3.13/angular-route.js"></script> + <script src="webjars/angularjs/1.3.13/angular-resource.js"></script> + <script src="webjars/angularjs/1.3.13/angular-messages.js"></script> ++ <script src="webjars/angularjs/1.3.13/angular-animate.js"></script> <!--<script src="nuiton-js/angular-ui-bootstrap.js"></script>--> - <script src="webjars/bootstrap/3.3.1/js/bootstrap.js"></script> - <script src="webjars/angular-translate/2.5.2/angular-translate.js"></script> - <script src="webjars/angular-dynamic-locale/0.1.24/src/tmhDynamicLocale.js"></script> + <script src="webjars/bootstrap/3.3.2/js/bootstrap.js"></script> + <script src="webjars/angular-translate/2.6.0/angular-translate.js"></script> + <script src="webjars/angular-dynamic-locale/0.1.27/src/tmhDynamicLocale.js"></script> <!--TODO ymartel 20141203 : extract version, or use wro --> - <script src="webjars/angular-ui-select/0.9.0/select.js"></script> - <link rel="stylesheet" href="webjars/angular-ui-select/0.9.0/select.css"> + <script src="webjars/angular-ui-select/0.9.6/select.js"></script> + <link rel="stylesheet" href="webjars/angular-ui-select/0.9.6/select.css"> <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.