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 25a3939bcc1d63c9485042dc3e66484dce02dc2e Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 21 17:36:32 2014 +0100 fixes #6122 add footer --- coselmar-ui/pom.xml | 23 +++++++++++ coselmar-ui/src/main/version.txt | 1 + coselmar-ui/src/main/webapp/css/coselmar.css | 47 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/index.html | 24 ++++++++++- .../src/main/webapp/js/coselmar-controllers.js | 9 ++++- .../src/main/webapp/js/coselmar-services.js | 18 ++++----- .../src/main/webapp/js/coselmar-user-services.js | 5 ++- coselmar-ui/src/main/webapp/version.txt | 1 + 8 files changed, 113 insertions(+), 15 deletions(-) diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 0d3d225..1e0ddcb 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -88,6 +88,29 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-version-file</id> + <goals><goal>copy-resources</goal></goals> + <phase>generate-resources</phase> + <configuration> + <outputDirectory>src/main/webapp</outputDirectory> + <resources> + <resource> + <directory>src/main</directory> + <includes> + <include>version.txt</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/coselmar-ui/src/main/version.txt b/coselmar-ui/src/main/version.txt new file mode 100644 index 0000000..f2ab45c --- /dev/null +++ b/coselmar-ui/src/main/version.txt @@ -0,0 +1 @@ +${project.version} \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css new file mode 100644 index 0000000..b53df61 --- /dev/null +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -0,0 +1,47 @@ +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} + +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} +body > .container { + padding: 60px 15px 0; +} +.container .text-muted { + margin: 20px 0; +} + +.footer { + position: absolute; + right: 0; + bottom: 0; + left: 0; + height: 30px; + width: 100%; + padding: 5px 0; + background-color: #f5f5f5; + color: #999; + text-align: center; + z-index:1000; + + .separator { + padding-left:.75%; + padding-right:.75%; + } + + a { + color: #999; + text-decoration:none; + + &:hover { + color:#fff; + background-color:transparent; + text-decoration:none; + } + } +} \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index f7f222d..15ca893 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -21,10 +21,11 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<html ng-app="coselmarApp"> +<html ng-app="coselmarApp" ng-controller="HomeCtrl"> <head> <link rel="stylesheet" href="nuiton-js/bootstrap.css"> + <link rel="stylesheet" href="css/coselmar.css"> <script src="nuiton-js/jquery.js"></script> <script src="nuiton-js/angular.js"></script> <script src="nuiton-js/angular-route.js"></script> @@ -88,7 +89,26 @@ </div> </header> - <div ng-view></div> + <div ng-view class="container"></div> + + + <footer class="footer"> + <div class="container"> + <a href="http://www.coselamr.fr" target="_blank">Coselmar</a> + <a href="https://forge.codelutin.com/projects/coselmar/files" target="_blank">{{version}}</a> + <span class="separator">-</span> + <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">Licence</a> + <span class="separator">-</span> + ©2014 + <a href="http://wwz.ifremer.fr/" target="_blank">Ifremer</a> + & + <a href="http://www.codelutin.com/" target="_blank">Code Lutin</a> + <span class="separator">-</span> + <a href="https://forge.codelutin.com/projects/coselmar/issues" target="_blank">Rapport de bug</a> + <span class="separator">-</span> + <a href="http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/coselmar-users" target="_blank">Support utilisateur</a> + </div> + </footer> </body> </html> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 02575e1..dba80a1 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -24,7 +24,14 @@ var coselmarControllers = angular.module('coselmarControllers', []); // Controller when the main page/view loads -coselmarControllers.controller("HomeCtrl", ['$scope', function($scope){ }]); +coselmarControllers.controller("HomeCtrl", ['$scope', '$http', + function ($scope, $http) { + + //Just get the version from a file + $http.get('version.txt', {'transformResponse':angular.identity}).success(function (data) { + $scope.version = data; + }); +}]); // Controller for All Documents View coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routeParams', '$location', 'documentService', function($scope, $route, $routeParams, $location, documentService){ diff --git a/coselmar-ui/src/main/webapp/js/coselmar-services.js b/coselmar-ui/src/main/webapp/js/coselmar-services.js index ce2b0da..26276cb 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-services.js @@ -31,14 +31,16 @@ function Document(resource){ this.resource = resource; +// var baseURL = "http://localhost:8081/services/v1/documents"; + var baseURL = "v1/documents"; + this.createDocument = function(metadata, file, scope){ var formData = new FormData(); formData.append("uploadFile", file); formData.append("document", JSON.stringify(metadata)); // Save the document - var docResource = resource('http://localhost:8081/services/v1/documents', null, { -// var docResource = resource('v1/documents', null, { + var docResource = resource(baseURL, null, { 'upload': { method:'POST', transformRequest: angular.identity, @@ -54,8 +56,7 @@ function Document(resource){ this.getDocument = function(id, scope){ // Load the document - var docResource = resource('http://localhost:8081/services/v1/documents/:documentId', {documentId:'@documentId'}); -// var docResource = resource('v1/documents/:documentId', {documentId:'@documentId'}); + var docResource = resource(baseURL + '/:documentId', {documentId:'@documentId'}); docResource.get({documentId:id}, function(document){ console.log(document); scope.document = document; @@ -65,15 +66,13 @@ function Document(resource){ this.deleteDocument = function(id, scope, successFunction){ // Load the document - var docResource = resource('http://localhost:8081/services/v1/documents/:documentId', {documentId:'@id'}); -// var docResource = resource('v1/documents/:documentId', {documentId:'@documentId'}); + var docResource = resource(baseURL + '/:documentId', {documentId:'@id'}); docResource.delete({documentId:id}, successFunction); } this.getDocumentFile = function(id, scope){ // Load the document -// var docResource = resource('http://localhost:8081/services/v1/documents/:documentId/file', {documentId:'@documentId'}); - var docResource = resource('v1/documents/:documentId/file', {documentId:'@documentId'}); + var docResource = resource(baseURL + '/:documentId/file', {documentId:'@documentId'}); docResource.get({documentId:id}, function(file){ // redirect to document page ? }); @@ -83,8 +82,7 @@ function Document(resource){ // Load all documents console.log("loading all documents"); - var docResource = resource('http://localhost:8081/services/v1/documents', {searchKeywords : scope.searchKeywords}); -// var docResource = resource('v1/documents', {searchKeywords : scope.searchKeywords}); + var docResource = resource(baseURL, {searchKeywords : scope.searchKeywords}); docResource.query(function(documents){ scope.documents = documents; }, function(errorResult) { diff --git a/coselmar-ui/src/main/webapp/js/coselmar-user-services.js b/coselmar-ui/src/main/webapp/js/coselmar-user-services.js index c52e69a..04357ba 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-user-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-user-services.js @@ -27,10 +27,11 @@ coselmarServices.factory('userService', ['$resource', function($resource){ function User(resource){ - var baseURL = "http://localhost:8081/services/v1/users"; this.resource = resource; -// this.baseURL = "v1/users"; + +// var baseURL = "http://localhost:8081/services/v1/users"; + var baseURL = "v1/users"; this.createUser = function(user, successFunction, failFunction){ diff --git a/coselmar-ui/src/main/webapp/version.txt b/coselmar-ui/src/main/webapp/version.txt new file mode 100644 index 0000000..dc92710 --- /dev/null +++ b/coselmar-ui/src/main/webapp/version.txt @@ -0,0 +1 @@ +0.2-SNAPSHOT \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.