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 3ededb51aa7bcc5fc81a59649b04b10dbb3ee78a Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 14:46:56 2016 +0100 Affichage plus large de la page et modification du nuage de mot --- coselmar-ui/src/main/webapp/css/coselmar.css | 53 +++++++++++++++++++++++----- coselmar-ui/src/main/webapp/i18n/en.js | 4 ++- coselmar-ui/src/main/webapp/i18n/fr.js | 6 ++-- coselmar-ui/src/main/webapp/views/home.html | 19 +++++----- 4 files changed, 61 insertions(+), 21 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 02de09f..0a5b1fc 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -21,7 +21,8 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -/* Sticky footer styles + +/* Layout -------------------------------------------------- */ html { position: relative; @@ -31,7 +32,7 @@ html { body { /* Margin bottom by footer height */ margin-bottom: 60px; - background: rgba( 57, 160, 168,0.5); + background: rgba( 57, 160, 168,0.3); } #main-container .container { padding: 20px 20px 50px 20px; @@ -41,6 +42,20 @@ body { #main-container > .container { width: 100% !important; } + +#main-container > .container .column { + width: 48%; + padding: 1%; + float: left; +} + +#main-container > .container .column.col-large { + width: 64%; +} +#main-container > .container .column.col-thin { + width: 32%; +} + #main-container { position: relative; margin: 0 auto; @@ -85,6 +100,8 @@ body { font-weight: normal; } +/* Sticky footer styles +-------------------------------------------------- */ .footer { position: absolute; right: 0; @@ -341,7 +358,7 @@ dl dd .status-adjourned { -------------------------------------------------- */ #main-container, body .container { - width: 970px; + width: 80%; } .btn-primary { @@ -466,19 +483,32 @@ input[type="file"] { z-index: 99; } +/* Nuage de mots +-------------------------------------------------- */ +.cloud { + background: #F5F5F5; + color: rgb(155,155,155); + text-align: center; + overflow: hidden; + box-shadow: 2px 2px 5px rgba(0,0,0,0.1); +} + + /* Media queries -------------------------------------------------- */ +@media screen and (max-width: 1200px) { + #main-container, + body .container { + width: 90%; + } +} + @media screen and (max-width: 1080px) { body { font-size: 13px; } - #main-container, - body .container { - width: 90%; - } - - + .navbar .navbar-brand .logo { height: 30px; padding-top: 3px; @@ -516,6 +546,11 @@ input[type="file"] { font-size: 11px; margin: 0 0 0 5px; } + #main-container > .container .column { + width: 100% !important; + padding: 0; + float: none; + } } @media screen and (min-width: 769px) and (max-width: 900px) { diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 5350e17..a4d7ffe 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -36,6 +36,7 @@ var translateEN = { "menu.item.documents.list" : "List", "menu.item.documents.add" : "Add a document", "menu.item.referential" : "Referential Search", +"menu.item.admin" : "Admin", "menu.button.login" : "Sign in", "menu.button.profile" : "Profile", @@ -330,7 +331,7 @@ var translateEN = { "CLOSED" : "Closed", "ADJOURNED" : "Adjourned", -"home.presentation.title" : "<h1><small>Welcome to</small> Coselmar Platform</h1>", +"home.presentation.title" : "<h1>Welcome to Coselmar Platform</h1>", "home.presentation.body" : "<p>This knowledge platform is intended to centralize the knowledge produced and exploited in the Coselmar project.</p>\ <p>Knowledge is structured around the concept of projects (research project, expertise, meeting, seminar etc.) which are \ attached objects (documents, data, publications, etc.) and those involved in these projects. The platform also manages the \ @@ -339,6 +340,7 @@ var translateEN = { <p>Access to this platform is secure. To obtain a right of access to thank you for the request through the Coselmar website contact page (<a href='http://www.coselmar.fr/contact/' target='_blank'>http://www.coselmar.fr/contact/</a>).</p>\ </p>", "home.lastProjects" : "Last projects", +"home.wordCloud" : "Most used words", "error.message.authentication.title" : "Error with authentication", "error.message.authentication.body" : "Error with authentication, please try to log again.", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 6c1072f..70d140e 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -36,6 +36,7 @@ var translateFR = { "menu.item.documents.list" : "Liste", "menu.item.documents.add" : "Ajouter un document", "menu.item.referential" : "Référentiel", +"menu.item.admin" : "Admin", "menu.button.login" : "Connexion", "menu.button.profile" : "Profil", @@ -297,7 +298,7 @@ var translateFR = { //Admin part "admin.tools.title" : "Outils Admin", -"admin.tools.label.luceneRefresh" : "Rafraichir l'index de rechercher", +"admin.tools.label.luceneRefresh" : "Rafraichir l'index de recherche.", "admin.tools.button.refresh" : "Rafraichir !", "admin.tools.message.refresh.inprogress" : "Mise à jour en cours.", "admin.tools.message.refresh.done" : "L'index de recherche à bien été raffraichi !", @@ -330,7 +331,7 @@ var translateFR = { "CLOSED" : "Fermé", "ADJOURNED" : "Ajourné", -"home.presentation.title" : "<h1><small>Bienvenue sur la</small> plateforme de Coselmar</h1>", +"home.presentation.title" : "<h1>Bienvenue sur la plateforme de Coselmar</h1>", "home.presentation.body" : "<p>Cette plateforme de connaissance a pour but de centraliser la connaissance exploitée et produite dans le cadre du projet Coselmar.</p>\ <p>La connaissance y est structurée autour du concept de projets (projet de recherche, expertise, réunion , séminaire etc.) auxquels sont\ rattachés des objets (documents, données, publications, etc.) et les personnes impliquées dans ces projets. La plateforme gère aussi les\ @@ -340,6 +341,7 @@ var translateFR = { <p>L'accès à cette plateforme est sécurisé. Pour obtenir un droit d'accès merci d'en faire la demande au travers de la page contact du site Coselmar (<a href='http://www.coselmar.fr/contact/' target='_blank'>http://www.coselmar.fr/contact/</a>).\ </p>", "home.lastProjects" : "Derniers projets", +"home.wordCloud" : "Mots les plus courants", "error.message.authentication.title" : "Échec d'authentification", "error.message.authentication.body" : "Une erreur avec l'authentification est survenue, veuillez vous reconnecter svp.", diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index 02861a7..fe3bc5f 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -23,10 +23,18 @@ --> <div> <div translate="home.presentation.title"></div> - <div style="margin-top : 50px" translate="home.presentation.body"></div> + + <div class="column" translate="home.presentation.body"></div> + + <div class="column cloud"> + <span class="title">{{ ""home.wordCloud" | translate }}</span> + <jqcloud words="topWords" width="500" height="300" + colors="{{cloudColors}}" + steps="21" font-size="{from:0.09, to:0.04}"></jqcloud> + </div> <!-- Show five last projects --> - <div> + <div class="clear"> <h2>{{ "home.lastProjects" | translate }}</h2> <table class="table table-bordered"> @@ -109,11 +117,4 @@ </table> <p ng-if="questions && questions.length == 0" translate="common.search.noResult" class="info"/> </div> - - <!-- FIXME Leo #CSS --> - <div align="center"> - <jqcloud words="topWords" width="500" height="350" - colors="{{cloudColors}}" - steps="21" font-size="{from:0.09, to:0.04}"></jqcloud> - </div> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.