[pollen] branch feature/homePage created (now 17426f2)
This is an automated email from the git hooks/post-receive script. New change to branch feature/homePage in repository pollen. See http://git.chorem.org/pollen.git at 17426f2 Edit homePage and add footer This branch includes the following new commits: new 17426f2 Edit homePage and add footer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/homePage in repository pollen. See http://git.chorem.org/pollen.git commit 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer --- pollen-ui-angular/src/main/webapp/index.html | 14 +++++++++++ .../src/main/webapp/js/controllers/mainCtrl.js | 9 +++++-- pollen-ui-angular/src/main/webapp/less/style.less | 28 +++++++++++++++++++++- .../src/main/webapp/partials/home.html | 16 ++++++++++--- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 5f47cf8..83c7714 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -174,6 +174,20 @@ <div ng-view class='container-fluid' id="content"></div> +<footer> + <a href="http://maven-site.chorem.org/pollen">Pollen</a> + <a href="http://www.chorem.org/projects/pollen/files">{{version}}</a> + <span class="separator">-</span> + <a href="http://www.gnu.org/licenses/agpl.html">Licence</a> + <span class="separator">-</span> + ©2009-2014 + <a href="http://www.codelutin.com/">Code Lutin</a> + <span class="separator">-</span> + <a href="http://www.chorem.org/projects/pollen/issues">Rapport de bug</a> + <span class="separator">-</span> + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">Support utilisateur</a> +</footer> + </body> </html> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js index 0e9ba5e..aacd075 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js @@ -20,8 +20,13 @@ */ 'use strict'; -angular.module('PollenMainControllers', ['pollenServices']).controller('MainCtrl', ['$scope', 'Page', - function ($scope, Page) { +angular.module('PollenMainControllers', ['pollenServices']) +.controller('MainCtrl', ['$scope', '$http', 'Page', + function ($scope, $http, Page) { + + $http.get('version.txt', {'transformResponse':angular.identity}).success(function (data) { + $scope.version = data; + }); $scope.$on('titleChange', function () { $scope.title = Page.title(); diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index e8159ec..223e061 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -39,7 +39,7 @@ /* global min width */ @media screen and (max-width: @responsive-min-width) { - #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link { + #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link, footer { width:@responsive-min-width !important; } } @@ -508,6 +508,32 @@ hr { } +footer { + position: absolute; + bottom: 0px; + width: 100%; + background-color: #222; + color: #999; + text-align: center; + border-top: 1px solid #080808; + + .separator { + padding-left:1.5%; + padding-right:1.5%; + } + + a { + color: #999; + text-decoration:none; + + &:hover { + color:#fff; + background-color:transparent; + text-decoration:none; + } + } +} + .full { position:fixed; top:0%; diff --git a/pollen-ui-angular/src/main/webapp/partials/home.html b/pollen-ui-angular/src/main/webapp/partials/home.html index 54b879a..517506e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/home.html +++ b/pollen-ui-angular/src/main/webapp/partials/home.html @@ -19,6 +19,16 @@ #L% --> -<div> - <img src="img/pollen.png"/> -</div> \ No newline at end of file +<div class="jumbotron"> + <div class="container"> + <h1> + Pollen, Application de sondage + </h1> + <p> + Créer dés maintenant votre sondage gratuitement. Partager le lien de vote. Et regarder le résultat. + </p> + <p class=""> + <a href="#/poll/create" class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-plus-sign"></span> {{ 'newPoll' | translate }}</a> + </p> + </div> +</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm