This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a815a0bc96e385f2d88bdabfbd60958bb6271c35 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 29 11:55:27 2017 +0200 style pour l'entête et mettre un menu différent pour l'administrateur --- .../src/main/web/tag/HeaderI18n.tag.html | 83 ++-------------------- .../src/main/web/tag/PollenHeader.tag.html | 30 ++++---- 2 files changed, 17 insertions(+), 96 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag.html b/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag.html index 2ac5668..177c019 100644 --- a/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag.html @@ -20,11 +20,11 @@ */ <HeaderI18n> - <div class="dropdown2"> - <a class="hlink"><i class="fa fa-globe"/></a> - <div class="dropdown-content2"> - <a onclick="{toEnglish}" class="flag en">English</a> - <a onclick="{toFrench}" class="flag fr">Français</a> + <div class="dropdown"> + <a class="header-link"><i class="fa fa-globe"/></a> + <div class="dropdown-content right"> + <a onclick="{toEnglish}"> <img src="../img/en.png"/> English</a> + <a onclick="{toFrench}"> <img src="../img/fr.png"/> Français</a> </div> </div> @@ -57,78 +57,5 @@ </script> <style> - - .hlink { - font-size: 1.3em; - display: flex; - text-align: center; - justify-content: center; - align-items: center; - padding: 0 20px 0 0; - cursor: pointer; - height: 3rem; - } - - .select { - display: inline-block; - width: 30px; - height: 41px; - background-image: - linear-gradient(45deg, transparent 50%, gray 50%), - linear-gradient(135deg, gray 50%, transparent 50%); - background-position: - 0px 18px, - 5px 18px; - background-size: - 5px 5px, - 5px 5px; - background-repeat: no-repeat; - } - - .flag { - background-repeat: no-repeat; - background-position: 16px center; - } - - .en { - background-image: url(../img/en.png); - } - - .fr { - background-image: url(../img/fr.png); - } - - .dropdown2 { - position: relative; - display: inline-block; - } - - /* Dropdown Content (Hidden by Default) */ - .dropdown-content2 { - display: none; - position: absolute; - right: 10px; - background-color: #f9f9f9; - box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); - } - - /* Links inside the dropdown */ - .dropdown-content2 a { - color: black; - text-decoration: none; - display: block; - padding: 12px 16px 12px 42px; - } - - /* Change color of dropdown links on hover */ - .dropdown-content2 a:hover { - background-color: #f1f1f1 - } - - /* Show the dropdown menu on hover */ - .dropdown2:hover .dropdown-content2 { - display: block; - } - </style> </HeaderI18n> diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html index 8f33ccb..e3ac88d 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html @@ -20,23 +20,22 @@ */ require("./HeaderI18n.tag.html"); <PollenHeader> - <div class="create dropdown"> - <a class="header-link"><i class="fa fa-bars"/></a> - <div class="dropdown-content"> - <a href="#poll/new/text"><i class="fa fa-list-ol"/> {__.createOtherPoll}</a> - <a href="#poll/new/date"><i class="fa fa-calendar"/> {__.createDatePoll}</a> - <virtual if="{admin}"> - <span role="separator" class="divider"></span> - <a href="#user">{__.users}</a> - <a href="#poll">{__.polls}</a> - </virtual> - </div> - </div> + <a class="header-link "href="#home" ><i class="fa fa-home"/></a> <div class="header-home"> <a class="header-link" href="#home" target="_top">Pollen</a> </div> + <div class="dropdown" if="{user && user.administrator}"> + <a class="header-link"> + <i class="fa fa-wrench"/> + </a> + <div class="dropdown-content right"> + <a href="#user">{__.users}</a> + <a href="#poll">{__.polls}</a> + </div> + </div> + <HeaderI18n/> <div class="dropdown"> @@ -57,11 +56,6 @@ require("./HeaderI18n.tag.html"); <a href="#user/favoriteLists">{__.myFavoriteLists}</a> <span role="separator" class="divider"></span> <a onclick="{signOut}">{__.signout}</a> - <virtual if="{user.administrator}"> - <span role="separator" class="divider"></span> - <a href="#user">{__.users}</a> - <a href="#poll">{__.polls}</a> - </virtual> </virtual> </div> </div> @@ -129,7 +123,7 @@ require("./HeaderI18n.tag.html"); justify-content: center; align-items: center; height: 3rem; - padding: 10px 20px; + padding: 10px 10px; cursor: pointer; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.