This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit a9ce8536898ed3dbd02f25d656e971f59e360de5 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jun 27 17:17:43 2014 +0200 udate UI, migrate css to less --- pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/pom.xml | 22 ++ pollen-ui-angular/src/main/webapp/css/style.css | 420 -------------------- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 + pollen-ui-angular/src/main/webapp/index.html | 31 +- .../src/main/webapp/js/controllers/pollCtrl.js | 1 - pollen-ui-angular/src/main/webapp/less/style.less | 438 +++++++++++++++++++++ .../src/main/webapp/less/variables.less | 12 + .../src/main/webapp/partials/poll-link.html | 49 ++- .../src/main/webapp/partials/poll.html | 6 +- 11 files changed, 545 insertions(+), 444 deletions(-) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 951db95..5575e6a 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,3 +1,4 @@ *.iml src/main/webapp/lib +src/main/webapp/css/style.css diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 8e8c94f..c2d33f7 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -18,6 +18,7 @@ "bootstrap": "3.1.1", "jquery": "2.1.1", "jqplot": "*", - "ckeditor": "4.4.2" + "ckeditor": "4.4.2", + "less": "1.7.3" } } diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index e46b933..3239320 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -43,6 +43,28 @@ <workingDirectory>${basedir}</workingDirectory> </configuration> </plugin> + + <plugin> + <groupId>org.lesscss</groupId> + <artifactId>lesscss-maven-plugin</artifactId> + <version>1.3.3</version> + <configuration> + <lessJs>${project.basedir}/src/main/webapp/lib/less/dist/less-1.7.3.min.js</lessJs> + <sourceDirectory>${project.basedir}/src/main/webapp/less</sourceDirectory> + <outputDirectory>${project.basedir}/src/main/webapp/css</outputDirectory> + <compress>true</compress> + <includes> + <include>style.less</include> + </includes> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css deleted file mode 100644 index ea6da2c..0000000 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ /dev/null @@ -1,420 +0,0 @@ -/* - * #%L - * Pollen :: UI (JS) - * $Id: style.css 3943 2014-05-15 10:23:42Z garandel $ - * $HeadURL: https://svn.chorem.org/pollen/trunk/pollen-ui-angular/src/main/webapp/css/st... $ - * %% - * Copyright (C) 2009 - 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -#pollenMenu { - position:fixed; - width:100%; - height:50px; - top:0px; - left:0px; -} -#content { - margin-top:60px; -} - -@media screen and (max-width:770px) { - #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link { - width:770px !important; - } -} - -.navbar .dropdown-menu.form { - width:250px; -} - -.navbar .dropdown-menu { - padding: 0; - padding-top: 15px; - padding-bottom: 5px; - left:auto; - right:0px; -} - -.dropdown-menu.form > form { - margin: 0; -} - -.dropdown-menu.form .form-actions { - padding: 15px 20px 20px; - margin-bottom: 0; - border-radius: 0 0 6px 6px; -} - -.dropdown-menu.form .control-group { - padding: 0 15px; - margin-bottom: 5px; -} - -.noListStyle { - list-style-type: none; -} - -.noListStyle i { - margin-right: 5px; -} - -.link { - cursor: pointer; -} - -.icon-link { - background-image: url(../img/glyphicons_050_link.png); - background-position: center; - background-repeat: no-repeat; - background-size: 12px 14px; -} - -i.bigger { - width: 24px; - height: 24px; - background-size: 21px 23px; -} - -i.icon-collapse { - background-position: -288px -120px; -} - -.collapsed i.icon-collapse { - background-position: -313px -119px; -} - -.list.alternate-colors > div { - padding: 10px 20px; -} - -.list.alternate-colors > .even { - background-color: rgb(245, 245, 245); -} - -.list.alternate-colors .footer { - color: rgb(150, 150, 150); -} - - -@media screen and (min-width: 1025px) { - #poll-link { - position:fixed; - top:0px; - left:0px; - width:300px; - height:100%; - padding-top:60px; - padding-left:5px; - padding-right:5px; - border-right:2px solid #EEE; - background-color:#DDD; - overflow:hidden; - z-index:50; - } - - #poll-link ul { - list-style-type:none; - margin-left:0px; - padding-left:0px; - } - - #poll-link ul li { - margin-bottom:15px; - } - - #poll-content { - margin-right:0px; - margin-left:300px; - } -} - -@media screen and (max-width: 1024px) { - #poll-link { - text-align:center; - position:fixed; - bottom:0px; - left:0px; - width:100%; - height:80px; - border-top:2px solid #EEE; - background-color:#DDD; - overflow:hidden; - z-index:50; - } - - #poll-link ul { - display:inline-block; - margin-left:3.247%; - margin-right:3.247%; - } - - #poll-link input { - display:none; - } - - #poll-content { - margin-bottom:80px; - } - - @media screen and (max-height:600px) { - #poll-link { - position:relative; - background-color:inherit; - border-color: #DDD; - } - #poll-content { - margin-bottom:0px; - } - } - -} - - -.pollTitle, .pollDesc { - margin-top:15px; - min-height:60px; - border-radius:5px; - padding-left:5px; - margin-bottom:30px; -} - -.pollTitle input[type="text"] { - width:99%; -} - -.pollAnim, #comments tr { - background-color:inherit; - transition-duration:0.8s; -} -.pollAnim:hover, #comments tr:hover { - background:#DDDDDD; - transition-duration: 0.8s; -} -.pollTitle input { - width:99%; - margin:auto; - height:40px; - font-size:20px; -} - -#poll { - text-align:center; -} -#poll table { - margin:auto; - margin-bottom:8px; -} - -#poll tr td > .btn-large { - height:60px; - width:80px; -} - - -.pollChoice { - min-width:150px; - padding-left:5px; - padding-right:5px; - padding-top:10px; - padding-bottom:5px; - text-align:center; - border:1px solid #DDD; - } - -.pollChoice input[type=text]{ - height:25px; - width:140px; - } - -.pollChoice input[type=checkbox]{ - width:25px; - height:25px; - } - -.pollChoice.voteTrue { - background-color:rgba(0,255,0,0.5); -} - -.pollChoice.voteFalse { - background-color:rgba(255,0,0,0.5); -} - -.right-inner-addon .glyphicon-input { - position: absolute; - right: 30px; - top:10px; - pointer-events: none; -} - -.fixe-input .ng-hide { - display:inline-block !important; - visibility:hidden; -} - -.pollBigChoice { - border-bottom:1px solid #DDDDDD; - text-align:right; -} -.pollBigChoice h3 { - background-color:rgba(0,0,0,0.1); - padding:5px; - height:40px; -} -.pollBigChoice button { - height:30px; -} -.pollBigChoice p { - text-align:justify; - white-space:pre-line; -} -.pollBigChoice textarea { - width:99%; -} -.pollBigChoice h3 input[type=text] { - width:99%; - text-align:right; -} -.pollBigChoice .pollChoiceInput { - margin-top:20px; - text-align:center; -} - -.pollBigVote { - float:right; - margin-top:5px; -} - -.alert-float { - position: fixed; - left:20%; - width:60%; - z-index: 100000; - opacity: 0.9; -} - -.danger { - color: #a94442; -} - -.fakeLink { - cursor:pointer; -} - -.input-mini { - font-size: 8pt; - height:16px; - margin:0px; - padding:0px; -} - -#comments { - margin-top:30px; - width:100%; - border-collapse:collapse; -} - -#comments tr td { - border-bottom:1px solid #DDD; - padding-top:5px; - padding-bottom:15px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -#comments tr>td:first-child { - width:200px; - border-right:1px solid #DDD; -} - -.container .control-group .form-control, .container .control-group .control-label { - margin-bottom:15px; - vertical-align:center; -} - -.voterList { - width:100%; - margin-top:25px; - margin-bottom:15px; - border:3px solid #DDD; -} - -.voterList tr th, .voterList tr td { - padding-top:8px; - padding-bottom:8px; - padding-left:5px; - padding-right:5px; - border:1px solid #DDD; -} - -.voterList tr th.weight, .voterList tr td.weight { - width:92px; -} - -.voterList tr th.weight input, .voterList tr td.weight input { - width:80px; -} - -.voterList tr td.action { - width:53px; -} - -hr { - border-top:1px solid #CCCCCC; -} - -.table-result { - margin-left: auto; - margin-right: auto; - margin-top:5px; - margin-bottom:15px; -} -.table-result tr, .table-result tr td, .table-result tr th { - padding:8px; - border: 1px solid #AAA; - transition-duration: 0.5s; -} - -.table-result tr:hover { - background:#DDDDDD; - transition-duration: 0.5s; -} - -.plot { - height:300px; - margin-top:5px; - margin-bottom:15px; -} - -.ng-enter, .ng-leave { - -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.25s; - transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.25s; -} - -.ng-leave { - height:0px; -} - -.ng-enter, -.ng-leave.ng-leave-active { - opacity:0; -} - -.ng-leave, -.ng-enter.ng-enter-active { - opacity:1; -} diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index ac2b420..256a92b 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -46,6 +46,12 @@ var translateFR = { 'poll.link.edit' : 'Lien d\'édition', 'poll.link.vote' : 'Lien de partage pour le vote', +'poll.link.result' : 'Lien du résultat du sondage', +'poll.link.clone' : 'Cloner le sondage', +'poll.link.export' : 'Exporter le sondage', +'poll.link.close' : 'Fermer les votes du sondage', +'poll.link.delete' : 'Supprimer le sondage', +'poll.link.hide' : 'Minifier le cadre', 'poll.edit' : 'Clique pour éditer', 'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index a07a804..23582be 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -26,7 +26,14 @@ <link rel="stylesheet" type="text/css" href="lib/bootstrap/dist/css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="lib/jqplot/jquery.jqplot.min.css" /> - <link rel="stylesheet" type="text/css" href="css/style.css"/> + <!-- TODO : compile less to css + $ lessc -x less/style.less css/style.css + ou + $ mvn compile + --> + <link rel="stylesheet/less" type="text/css" href="less/style.less" /> + <script language="javascript" type="text/javascript" src="lib/less/dist/less-1.7.3.min.js"></script> + <!--<link rel="stylesheet" type="text/css" href="css/style.css"/>--> <script language="javascript" type="text/javascript" src="js/conf.js"></script> @@ -47,17 +54,17 @@ <script language="javascript" type="text/javascript" src="lib/angular-animate/angular-animate.min.js"></script> <script language="javascript" type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - <script language=javascript" type="text/javascript" src="js/app.js"></script> - <script language=javascript" type="text/javascript" src="js/directives.js"></script> - <script language=javascript" type="text/javascript" src="js/services.js"></script> - <script language=javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> - <script language=javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> - <script language=javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> - <script language=javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> - <script language=javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> - - <script language=javascript" type="text/javascript" src="i18n/fr.js"></script> - <script language=javascript" type="text/javascript" src="i18n/en.js"></script> + <script language="javascript" type="text/javascript" src="js/app.js"></script> + <script language="javascript" type="text/javascript" src="js/directives.js"></script> + <script language="javascript" type="text/javascript" src="js/services.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> + + <script language="javascript" type="text/javascript" src="i18n/fr.js"></script> + <script language="javascript" type="text/javascript" src="i18n/en.js"></script> </head> <body> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 917f491..ca5257e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -103,7 +103,6 @@ angular.module('pollControllers', []) }); pollDeferred.promise.then(function () { - console.log($location); var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less new file mode 100644 index 0000000..b6c8c79 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -0,0 +1,438 @@ +@import "variables.less"; + +#pollenMenu { + position:fixed; + width:100%; + height:50px; + top:0px; + left:0px; +} +#content { + margin-top:60px; +} + +@media screen and (max-width:770px) { + #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link { + width:770px !important; + } +} + +.navbar .dropdown-menu { + padding: 0; + padding-top: 15px; + padding-bottom: 5px; + left:auto; + right:0px; + + &.form { + width:250px; + + > form { + margin: 0; + } + } + + .form-actions { + padding: 15px 20px 20px; + margin-bottom: 0; + border-radius: 0 0 6px 6px; + } + + .control-group { + padding: 0 15px; + margin-bottom: 5px; + } +} + +@media screen and (min-width: (@responsive-large-width + 1px)) { + @width-max : 300px; + @width-min : 35px; + + #poll-link { + position:fixed; + top:0px; + left:0px; + width: @width-max; + height:100%; + padding-top:60px; + padding-left:5px; + padding-right:5px; + border-right:2px solid @borderColor; + background-color: @gray-lighter; + overflow:hidden; + z-index:50; + + &.mini-link-remove { + -webkit-transition:width linear @short-time-transition; + transition:width linear @short-time-transition; + + ul li .text, ul li input { + display: none; + opacity:0; + } + } + + &.mini-link { + -webkit-transition:width linear @short-time-transition; + transition:width linear @short-time-transition; + + width: @width-min; + + ul li { + margin-bottom:3px; + font-size:1.2em; + + .text, input { + display:none; + } + + &.toMini { + text-align:left; + } + } + } + + ul { + list-style-type:none; + margin-left:0px; + padding-left:0px; + + li { + margin-bottom:30px; + font-size:1.2em; + + &.empty { + display:none; + } + &.toMini { + text-align:right; + } + } + } + } + + #poll-content { + margin-right:0px; + margin-left: @width-max; + + &.maxi-content-remove { + -webkit-transition:margin linear @short-time-transition; + transition:margin linear @short-time-transition; + } + &.maxi-content { + margin-left: @width-min; + + -webkit-transition:margin linear @short-time-transition; + transition:margin linear @short-time-transition; + } + + } +} + +@media screen and (max-width: @responsive-large-width) { + @foot-padding : 1.8%; + @foot-height : 80px; + @responsive-height: 600px; + + #poll-link { + text-align:center; + position:fixed; + bottom:0px; + left:0px; + width:100%; + height:@foot-height; + border-top:2px solid @borderColor; + background-color:@gray-lighter; + overflow:hidden; + z-index:50; + + ul { + list-style-type:none; + display:inline-block; + margin:0px; + padding-left: @foot-padding; + padding-right: @foot-padding; + text-align:left; + + li.toMini { + display:none; + } + } + + input { + display:none; + } + + @media (max-height: @responsive-height) { + position:relative; + background-color:inherit; + border-color: @borderColor; + } + } + + #poll-content { + margin-bottom: @foot-height + 15px; + + @media (max-height: @responsive-height) { + margin-bottom:0px; + } + } +} + + +.pollTitle, .pollDesc { + margin-top:15px; + min-height:60px; + border-radius:5px; + padding-left:5px; + margin-bottom:30px; +} + +.pollAnim { + background-color:inherit; + transition-duration:@time-transition; + + &:hover { + background:@borderColor; + transition-duration: @time-transition; + } +} + +#poll { + text-align:center; + + table { + margin:auto; + margin-bottom:8px; + } +} + +.btn-large { + height:60px; + width:80px; +} + + +.pollChoice { + min-width:150px; + padding-left:5px; + padding-right:5px; + padding-top:10px; + padding-bottom:5px; + text-align:center; + border:1px solid @borderColor; + + + input[type=text]{ + height:25px; + width:140px; + } + input[type=checkbox]{ + width:25px; + height:25px; + } + + .voteTrue { + background-color:@brand-success; + } + .voteFalse { + background-color:@brand-danger; + } +} + +.right-inner-addon .glyphicon-input { + position: absolute; + right: 30px; + top:10px; + pointer-events: none; +} + +.fixe-input .ng-hide { + display:inline-block !important; + visibility:hidden; +} + +.pollBigChoice { + border-bottom:1px solid @borderColor; + text-align:right; + + h3 { + background-color:rgba(0,0,0,0.1); + padding:5px; + height:40px; + + input[type=text] { + width:99%; + text-align:right; + } + } + + button { + height:30px; + } + + p { + text-align:justify; + white-space:pre-line; + } + textarea { + width:99%; + } + + .pollChoiceInput { + margin-top:20px; + text-align:center; + } +} + +.pollBigVote { + float:right; + margin-top:5px; +} + +.alert-float { + position: fixed; + left:20%; + width:60%; + z-index: 100000; + opacity: 0.9; +} + +.danger { + color: @danger-color; + transition-duration:@short-time-transition; + + &:hover { + color: @danger-hover-color; + transition-duration:@short-time-transition; + } +} + +a { + transition-duration:@short-time-transition; + + &:hover { + transition-duration:@short-time-transition; + } +} + +.fakeLink { + cursor:pointer; +} + +.input-mini { + font-size: 8pt; + height:16px; + margin:0px; + padding:0px; +} + +#comments { + margin-top:30px; + width:100%; + border-collapse:collapse; + + tr { + background-color:inherit; + transition-duration:@time-transition; + + &:hover { + background:@borderColor; + transition-duration: @time-transition; + } + + td { + border-bottom:1px solid @borderColor; + padding-top:5px; + padding-bottom:15px; + padding-left:5px; + padding-right:5px; + vertical-align:top; + } + + &>td:first-child { + width:200px; + border-right:1px solid @borderColor; + } + } +} + +.container .control-group .form-control, .container .control-group .control-label { + margin-bottom:15px; + vertical-align:center; +} + +.voterList { + @width-input : 92px; + @width-action : 53px; + + width:100%; + margin-top:25px; + margin-bottom:15px; + border:3px solid @borderColor; + + tr th, tr td { + padding-top:8px; + padding-bottom:8px; + padding-left:5px; + padding-right:5px; + border:1px solid @borderColor; + + &.weight { + width: @width-input; + } + + &.action { + width:@width-action; + } + } +} + +hr { + border-top:1px solid #CCCCCC; +} + +.table-result { + margin-left: auto; + margin-right: auto; + margin-top:5px; + margin-bottom:15px; + + tr { + td, th { + padding:8px; + border: 1px solid @borderColor; + } + transition-duration: @time-transition; + + &:hover { + background: @borderColor; + transition-duration: @time-transition; + } + } +} + +.plot { + height:300px; + margin-top:5px; + margin-bottom:15px; +} + +.ng-enter, .ng-leave { + -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) @short-time-transition; + transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) @short-time-transition; +} + +.ng-leave { + height:0px; +} + +.ng-enter, +.ng-leave.ng-leave-active { + opacity:0; +} + +.ng-leave, +.ng-enter.ng-enter-active { + opacity:1; +} diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less new file mode 100644 index 0000000..31cd251 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -0,0 +1,12 @@ +@import "../lib/bootstrap/less/variables.less"; + +@time-transition : 0.8s; +@short-time-transition : 0.2s; +@long-time-transition : 1.6s; + +@borderColor : #dddddd; + +@danger-color : @brand-danger; +@danger-hover-color : darken(@danger-color, 15%); + +@responsive-large-width : 1024px; \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index f959584..0551923 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -19,25 +19,60 @@ #L% --> <ul> + <li class="toMini" ng-click="globalVariables.minify = !globalVariables.minify"> + <a class="fakeLink" ng-show="globalVariables.minify"><span class="glyphicon glyphicon-chevron-right"></span></a> + <a class="fakeLink" ng-hide="globalVariables.minify"><span class="glyphicon glyphicon-chevron-left"></span></a> + </li> <li> - <a href="{{globalVariables.linkVote}}">{{ 'poll.link.vote' | translate }}</a> + <a href="{{globalVariables.linkVote}}"> + <span class="glyphicon glyphicon-link" title="{{ 'poll.link.vote' | translate }}"></span> + <span class="text">{{ 'poll.link.vote' | translate }}</span> + </a> <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control input-mini"/> </li> <li> - <a href="{{globalVariables.linkResult}}">{{ 'poll.link.result' | translate }}</a> + <a href="{{globalVariables.linkResult}}"> + <span class="glyphicon glyphicon-stats" title="{{ 'poll.link.result' | translate }}"></span> + <span class="text">{{ 'poll.link.result' | translate }}</span> + </a> <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> + <li class="empty"> </li> </ul> <ul> <li> - <a href="{{globalVariables.linkEdit}}">{{ 'poll.link.edit' | translate }}</a> + <a href="{{globalVariables.linkEdit}}"> + <span class="glyphicon glyphicon-pencil" title="{{ 'poll.link.edit' | translate }}"></span> + <span class="text">{{ 'poll.link.edit' | translate }}</span> + </a> <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control input-mini"/> </li> - <li><a class="fakeLink">{{ 'poll.link.clone' | translate }} (disabled)</a></li> - <li><a class="fakeLink">{{ 'poll.link.export' | translate }} (disabled)</a></li> + <li> + <a class="fakeLink"> + <span class="glyphicon glyphicon-transfer" title="{{ 'poll.link.clone' | translate }}"></span> + <span class="text">{{ 'poll.link.clone' | translate }} (disabled)</span> + </a> + </li> + <li> + <a class="fakeLink"> + <span class="glyphicon glyphicon-export" title="{{ 'poll.link.export' | translate }}"></span> + <span class="text">{{ 'poll.link.export' | translate }} (disabled)</span> + </a> + </li> </ul> <ul> - <li><a class="fakeLink danger">{{ 'poll.link.close' | translate }}</a></li> - <li><a class="fakeLink danger" ng-click="deletePoll()">{{ 'poll.link.delete' | translate }}</a></li> + <li> + <a class="fakeLink danger"> + <span class="glyphicon glyphicon-remove" title="{{ 'poll.link.close' | translate }}"></span> + <span class="text">{{ 'poll.link.close' | translate }}</span> + </a> + </li> + <li> + <a class="fakeLink danger" ng-click="deletePoll()"> + <span class="glyphicon glyphicon-trash" title="{{ 'poll.link.delete' | translate }}"></span> + <span class="text">{{ 'poll.link.delete' | translate }}</span> + </a> + </li> + <li class="empty"> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 5956368..d5005b3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -19,7 +19,7 @@ #L% --> -<div id="poll-content"> +<div id="poll-content" ng-class="{'maxi-content': globalVariables.minify}"> <ul class="nav nav-tabs"> <li ng-class="{active: tab == 'home'}"><a href="{{globalVariables.linkHome || '#/poll/create/home' }}" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}" ng-click="tab = 'vote'">{{ 'poll.tab.vote' | translate }}</a></li> @@ -43,6 +43,6 @@ <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'"></div> - <div ng-include="'./partials/poll-link.html'" id="poll-link" ></div> +</div> -</div> \ No newline at end of file +<div ng-include="'./partials/poll-link.html'" id="poll-link" ng-class="{'mini-link': globalVariables.minify}"></div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.