This is an automated email from the git hooks/post-receive script. New commit to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git commit 3efffc557f42861211ff04dad4bd246be92d6f49 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 17:16:29 2015 +0200 Put back saints calendar on home page --- chorem-ui-angular/src/main/webapp/css/chorem.css | 86 ++++++++++++++++++++++ chorem-ui-angular/src/main/webapp/home.html | 47 ++++++++++-- chorem-ui-angular/src/main/webapp/index.html | 4 + chorem-ui-angular/src/main/webapp/js/chorem.js | 2 +- .../src/main/webapp/js/choremControllers.js | 8 ++ 5 files changed, 141 insertions(+), 6 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/css/chorem.css b/chorem-ui-angular/src/main/webapp/css/chorem.css new file mode 100644 index 0000000..3c98471 --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/css/chorem.css @@ -0,0 +1,86 @@ +/* L'affiche du calendrier sur la page d'accueil */ +.calendar{ + margin:.25em 10px 10px 0; + padding-top:5px; + float:left; + width:80px; + background:#ededef; + background: -webkit-gradient(linear, left top, left bottom, from(#ededef), to(#ccc)); + background: -moz-linear-gradient(top, #ededef, #ccc); + font:bold 40px/60px Arial Black, Arial, Helvetica, sans-serif; + text-align:center; + color:#000; + text-shadow:#fff 0 1px 0; + -moz-border-radius:3px; + -webkit-border-radius:3px; + border-radius:3px; + position:relative; + -moz-box-shadow:0 2px 2px #888; + -webkit-box-shadow:0 2px 2px #888; + box-shadow:0 2px 2px #888; +} + +.calendar span.week { + display:block; + font: 10px/20px Arial Black, Arial, Helvetica, sans-serif; +} + +.calendar span.saint { + display:block; + font:normal bold 11px/11px Arial, Helvetica, sans-serif; + text-shadow:#00365a 0 -1px 0; +} + +.calendar:before, .calendar:after{ + content:''; + float:left; + position:absolute; + top:5px; + width:8px; + height:8px; + background:#111; + z-index:1; + -moz-border-radius:10px; + -webkit-border-radius:10px; + border-radius:10px; + -moz-box-shadow:0 1px 1px #fff; + -webkit-box-shadow:0 1px 1px #fff; + box-shadow:0 1px 1px #fff; +} +.calendar:before{left:11px;} +.calendar:after{right:11px;} + +.calendar em{ + display:block; + font:normal bold 11px/30px Arial, Helvetica, sans-serif; + color:#fff; + text-shadow:#00365a 0 -1px 0; + background:#04599a; + background:-webkit-gradient(linear, left top, left bottom, from(#04599a), to(#00365a)); + background:-moz-linear-gradient(top, #04599a, #00365a); + -moz-border-radius-bottomright:3px; + -webkit-border-bottom-right-radius:3px; + border-bottom-right-radius:3px; + -moz-border-radius-bottomleft:3px; + -webkit-border-bottom-left-radius:3px; + border-bottom-left-radius:3px; + border-top:1px solid #00365a; +} + +.calendar em:before, .calendar em:after{ + content:''; + float:left; + position:absolute; + top:-5px; + width:4px; + height:14px; + background:#dadada; + background:-webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#aaa)); + background:-moz-linear-gradient(top, #f1f1f1, #aaa); + z-index:2; + -moz-border-radius:2px; + -webkit-border-radius:2px; + border-radius:2px; +} +.calendar em:before{left:13px;} +.calendar em:after{right:13px;} \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/home.html b/chorem-ui-angular/src/main/webapp/home.html index 134ed7d..f9f807b 100644 --- a/chorem-ui-angular/src/main/webapp/home.html +++ b/chorem-ui-angular/src/main/webapp/home.html @@ -15,7 +15,7 @@ <div class="panel-body"> <div class="row"> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/contacts" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-users"></i> <h4> Personnes @@ -33,7 +33,7 @@ </a> </div> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/notes" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-clipboard"></i> <h4> Notes @@ -42,7 +42,7 @@ </a> </div> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/charts" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-bar-chart-o"></i> <h4> Charts @@ -101,8 +101,7 @@ <!--bar chart--> <div class="bootcards-chart-canvas" id="chartClosedSales"></div> - <div class="panel-footer - </div>"> + <div class="panel-footer"> </div> </div> @@ -110,4 +109,42 @@ </div> </div> </div> + + + + + + + +</div> + +<div class="row"> + + <div class="bootcards-cards"> + + <div class="col-sm-4"> + + <div class="panel panel-default bootcards-summary" ng-controller="HomePageCalendarController"> + + <div class="panel-heading"> + <h3 class="panel-title">Aujourd'hui</h3> + </div> + + <div class="panel-body"> + <p class="calendar"> + {{date|date:'dd'}} + <span class="saint">{{saints}}</span> + <span class="week">semaine {{date|date:'w'}}</span> + <em>{{date|date:'MMM'}}</em> + </p> + </div> + + <div class="panel-footer"> + </div> + + </div> + + </div> + + </div> </div> diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html index 823606c..7814bc3 100644 --- a/chorem-ui-angular/src/main/webapp/index.html +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -15,6 +15,10 @@ <script src="js/crm/crm.js"></script> <script src="js/crm/crmControllers.js"></script> <script src="js/chorem.js"></script> + <script src="js/choremControllers.js"></script> + + <link rel="stylesheet" href="css/chorem.css"> + <link href="webjars/bootcards/1.1.0/css/bootcards-desktop.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-desktop..." rel="stylesheet"/> <link href="webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" /> diff --git a/chorem-ui-angular/src/main/webapp/js/chorem.js b/chorem-ui-angular/src/main/webapp/js/chorem.js index 72c34f9..0735cea 100644 --- a/chorem-ui-angular/src/main/webapp/js/chorem.js +++ b/chorem-ui-angular/src/main/webapp/js/chorem.js @@ -1,4 +1,4 @@ -var chorem = angular.module('chorem', ['ngRoute','ui.select','ngSanitize', 'ui.bootstrap', 'ui.router', 'chorem.crm']); +var chorem = angular.module('chorem', ['ngRoute','ui.select','ngSanitize', 'ui.bootstrap', 'ui.router', 'chorem.crm', 'chorem.controllers']); chorem.run( [ '$rootScope', '$state', '$stateParams', diff --git a/chorem-ui-angular/src/main/webapp/js/choremControllers.js b/chorem-ui-angular/src/main/webapp/js/choremControllers.js new file mode 100644 index 0000000..76932ed --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/js/choremControllers.js @@ -0,0 +1,8 @@ +var choremControllers = angular.module('chorem.controllers', ['ui.router']); + +choremControllers.controller('HomePageCalendarController', function ($scope) { + + $scope.date=new Date(); + $scope.saints=""; + +}); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.