From 34689daaa83569ebba16e4171fbab36a66b8f858 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Fri, 27 Nov 2015 13:24:36 +0100 Subject: [PATCH] fix tooltip in record editor fix images path in record editor wip: standardize font-sizes --- resources/www/_shared/styles/_main-menu.scss | 2 +- resources/www/_shared/styles/_variables.scss | 9 +- .../www/_shared/styles/jquery-ui/_shared.scss | 7 +- resources/www/_shared/styles/main.scss | 28 ++-- resources/www/admin/styles/main.scss | 2 + .../ui-bg_gloss-wave_20_111111_500x100.png | Bin resources/www/common/js/jquery.tooltip.js | 13 +- resources/www/common/styles/main.scss | 33 ---- resources/www/lightbox/styles/main.scss | 3 +- resources/www/oauth/main.scss | 5 +- resources/www/prod/js/jquery.main-prod.js | 5 +- .../www/prod/skins/000000/skin-000000.scss | 4 +- .../ui-bg_gloss-wave_20_111111_500x100.png | Bin 1620 -> 0 bytes .../www/prod/skins/959595/skin-959595.scss | 11 +- resources/www/prod/skins/skin-shared.scss | 29 ++-- .../prod/skins/ui-components/_actions.scss | 2 +- .../skins/ui-components/_answers-tools.scss | 6 +- .../prod/skins/ui-components/_answers.scss | 16 +- .../prod/skins/ui-components/_buttons.scss | 2 +- .../www/prod/skins/ui-components/_diapo.scss | 3 +- .../prod/skins/ui-components/_jquery-ui.scss | 4 +- .../skins/ui-components/_modal-bridge.scss | 3 +- .../prod/skins/ui-components/_modal-edit.scss | 3 +- .../skins/ui-components/_modal-preview.scss | 2 +- .../skins/ui-components/_modal-publish.scss | 2 +- .../prod/skins/ui-components/_modal-push.scss | 156 +++++++++--------- .../prod/skins/ui-components/_pagination.scss | 2 +- .../www/prod/skins/ui-components/_upload.scss | 2 +- .../ui-components/_workzone-baskets.scss | 6 +- .../ui-components/_workzone-proposals.scss | 6 +- .../ui-components/_workzone-thesaurus.scss | 2 +- .../prod/skins/ui-components/_workzone.scss | 2 +- resources/www/setup/styles/main.scss | 6 +- templates/web/overview.html.twig | 58 +++---- .../web/prod/actions/edit_default.html.twig | 2 +- templates/web/prod/results/record.html.twig | 2 +- templates/web/prod/templates/upload.html.twig | 2 +- 37 files changed, 209 insertions(+), 231 deletions(-) rename resources/www/{prod/skins/000000/images => common/images/icons}/ui-bg_gloss-wave_20_111111_500x100.png (100%) delete mode 100644 resources/www/prod/skins/959595/images/ui-bg_gloss-wave_20_111111_500x100.png diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index 8c49cc8901..bc447d7b4d 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -42,7 +42,7 @@ $mainMenuBottomBorder: none !default; display: inline-block; color: $mainMenuLinkColor; > span { - font-size: 12px; + font-size: $xmediumFontSize; font-weight: normal; border-top: 3px solid transparent; display: block; diff --git a/resources/www/_shared/styles/_variables.scss b/resources/www/_shared/styles/_variables.scss index 40313353a3..cdebe713fa 100644 --- a/resources/www/_shared/styles/_variables.scss +++ b/resources/www/_shared/styles/_variables.scss @@ -7,4 +7,11 @@ $mainMenuLineHeight: 36px; $baseBorderRadius: 3px; $borderRadiusLarge: 4px; -$borderRadiusSmall: 2px; \ No newline at end of file +$borderRadiusSmall: 2px; + + +$defaultFontFamily: Helvetica, Arial, sans-serif; +$xsmallFontSize: 8px; +$smallFontSize: 10px; +$xmediumFontSize: 12px; +$mediumFontSize: 13px; diff --git a/resources/www/_shared/styles/jquery-ui/_shared.scss b/resources/www/_shared/styles/jquery-ui/_shared.scss index f41f239458..d7e8b6102c 100644 --- a/resources/www/_shared/styles/jquery-ui/_shared.scss +++ b/resources/www/_shared/styles/jquery-ui/_shared.scss @@ -339,7 +339,7 @@ button.ui-button::-moz-focus-inner { text-align: center; } .ui-datepicker .ui-datepicker-title select { - font-size: 1em; + //font-size: 1em; margin: 1px 0; } .ui-datepicker select.ui-datepicker-month-year { @@ -351,7 +351,7 @@ button.ui-button::-moz-focus-inner { } .ui-datepicker table { width: 100%; - font-size: .9em; + //font-size: .9em; border-collapse: collapse; margin: 0 0 .4em; } @@ -780,6 +780,7 @@ body .ui-tooltip { /* Component containers ----------------------------------*/ +/* let bootstrap handle font-size .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; @@ -793,7 +794,7 @@ body .ui-tooltip { .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; -} +}*/ /* positioning */ diff --git a/resources/www/_shared/styles/main.scss b/resources/www/_shared/styles/main.scss index da70342900..688dc75f1b 100644 --- a/resources/www/_shared/styles/main.scss +++ b/resources/www/_shared/styles/main.scss @@ -1,12 +1,12 @@ @import 'variables'; /** skin/common/main.css */ -body{ - margin:0; - padding:0; - font-family:Helvetica,Arial,sans-serif; - font-size:12px; - overflow:hidden; +body { + margin: 0; + padding: 0; + font-family: $defaultFontFamily; + font-size: $mediumFontSize; + overflow: hidden; } @@ -23,13 +23,15 @@ img{ position:absolute; z-index:32000; overflow:hidden; + hr{ + margin: 8px 0; + } + .popover { + max-width: none; + width: auto; + } } -#tooltip hr{ - margin: 8px 0; -} - - .PNB { position:absolute; @@ -56,10 +58,6 @@ input.checkbox{ display:none; } -#tooltip .popover { - max-width: none; - width: auto; -} .ui-dialog-titlebar { min-height: 20px; diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 672bde3372..254a8c409c 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -20,6 +20,8 @@ body { padding: 0; background-color: #ffffff; color: #333333; + font-family: $defaultFontFamily; + font-size: $mediumFontSize; overflow-y: auto; } .clear { diff --git a/resources/www/prod/skins/000000/images/ui-bg_gloss-wave_20_111111_500x100.png b/resources/www/common/images/icons/ui-bg_gloss-wave_20_111111_500x100.png similarity index 100% rename from resources/www/prod/skins/000000/images/ui-bg_gloss-wave_20_111111_500x100.png rename to resources/www/common/images/icons/ui-bg_gloss-wave_20_111111_500x100.png diff --git a/resources/www/common/js/jquery.tooltip.js b/resources/www/common/js/jquery.tooltip.js index fd0ae6cd12..c09e7376c7 100644 --- a/resources/www/common/js/jquery.tooltip.js +++ b/resources/www/common/js/jquery.tooltip.js @@ -300,7 +300,8 @@ topOffset = 20, leftOffset = 20; - if( $eventTarget ) { + console.log($eventTarget.length) + if( $eventTarget.length > 0 ) { // change offsets: topOffset = -8; leftOffset = -8; @@ -318,7 +319,7 @@ var ratioImage = $(h).width() / $(h).height(); //position de l'image - console.log('$eventTarget', $eventTarget) + if ($eventTarget.offset().left > (v.x - $eventTarget.offset().left - $eventTarget.width())) { hor = 'gauche'; wiH = $eventTarget.offset().left; @@ -493,6 +494,10 @@ // delete timeout and show helper function show() { tID = null; + var isBrowsable = false; + if( $.tooltip.current !== null ) { + isBrowsable = settings($.tooltip.current).isBrowsable; + } if ((!IE || !$.fn.bgiframe) && settings($.tooltip.current).fade) { if (helper.parent.is(":animated")) @@ -507,12 +512,12 @@ .unbind('mouseenter') .unbind('mouseleave') .mouseenter(function(){ - if (settings($.tooltip.current).isBrowsable) { + if (isBrowsable) { $.tooltip.currentHover = true; } }) .mouseleave(function () { - if (settings($.tooltip.current).isBrowsable) { + if (isBrowsable) { // if tooltip has scrollable content or selectionnable text - should be closed on mouseleave: $.tooltip.currentHover = false; helper.parent.hide(); diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index 8262fcd930..9a8a320fde 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -20,40 +20,7 @@ $mainMenuLinkBackgroundHoverColor: transparent; #mainContent { margin-top: $mainMenuHeight; - #page { - background-color: #414141; - } } -body { - color: #FFFFFF; - background-color: #212121; - font-family: Helvetica, Arial, sans-serif; - font-size: 14px; - overflow: auto; - min-height: 100%; - width: 100%; -} -h1 { - font-size: 26px; - font-weight: bold; - padding: 50px 0 20px; -} -#page { - width: 860px; - background-color: #414141; - padding: 0 20px; - margin: 0 auto; - height: 100%; - position: relative !important; -} - -.preview .thumb_wrapper { - overflow: hidden; -} - -.caption { - padding: 50px 0 20px; -} diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss index ce25c17f9c..cd308e35e2 100644 --- a/resources/www/lightbox/styles/main.scss +++ b/resources/www/lightbox/styles/main.scss @@ -14,7 +14,8 @@ body { background-color: #BFBFBF; color: #212121; /*font-size:11px;*/ - font-family: Arial, Helvetica, sans-serif; + font-family: $defaultFontFamily; + font-size: $mediumFontSize; } #mainContent { diff --git a/resources/www/oauth/main.scss b/resources/www/oauth/main.scss index 6b7269be27..af096e9fb8 100644 --- a/resources/www/oauth/main.scss +++ b/resources/www/oauth/main.scss @@ -1,10 +1,11 @@ /********* Default CSS Oauth pages *********/ /****************** Page *******************/ - +@import '../_shared/styles/variables'; html, body { background: #000000; - font-family: Verdana, sans-serif; + font-family: $defaultFontFamily; + font-size: $mediumFontSize; color: #FFFFFF; } diff --git a/resources/www/prod/js/jquery.main-prod.js b/resources/www/prod/js/jquery.main-prod.js index 13041f56a0..b07fc8aec2 100644 --- a/resources/www/prod/js/jquery.main-prod.js +++ b/resources/www/prod/js/jquery.main-prod.js @@ -324,7 +324,7 @@ function checkFilters(save) { search.dates.minbound = $('#ADVSRCH_DATE_ZONE input[name=date_min]', adv_box).val(); search.dates.maxbound = $('#ADVSRCH_DATE_ZONE input[name=date_max]', adv_box).val(); search.dates.field = $('#ADVSRCH_DATE_ZONE select[name=date_field]', adv_box).val(); - + console.log(search.dates.minbound, search.dates.maxbound, search.dates.field) if ($.trim(search.dates.minbound) || $.trim(search.dates.maxbound)) { danger = true; $('#ADVSRCH_DATE_ZONE', adv_box).addClass('danger'); @@ -1008,8 +1008,11 @@ function HueToRgb(m1, m2, hue) { $(document).ready(function () { $('input[name=search_type]').bind('click', function () { + console.log('search bind') var $this = $(this); var $record_types = $('#recordtype_sel'); + + console.log($this.hasClass('mode_type_reg'), $record_types) if ($this.hasClass('mode_type_reg')) { $record_types.css("visibility", "hidden"); // better than hide because does not change layout $record_types.prop("selectedIndex", 0); diff --git a/resources/www/prod/skins/000000/skin-000000.scss b/resources/www/prod/skins/000000/skin-000000.scss index 3b669d78fd..df3ec0a475 100644 --- a/resources/www/prod/skins/000000/skin-000000.scss +++ b/resources/www/prod/skins/000000/skin-000000.scss @@ -123,9 +123,9 @@ $tabsNavBg: #666666; $tabsNavBgActive: $mediumBackgroundColor; $contentLoaderImg: 'loader-white.gif'; -$btnBackground: #EAEAEA; +$btnBackground: #f2f2f2; $btnBackgroundHighlight: #D6D6D6; -$btnColor: #8e8e8e; +$btnColor: #737373; $btnTextShadow: 0 -1px 0 rgba(0,0,0,0); $btnInverseBackground: #444444; diff --git a/resources/www/prod/skins/959595/images/ui-bg_gloss-wave_20_111111_500x100.png b/resources/www/prod/skins/959595/images/ui-bg_gloss-wave_20_111111_500x100.png deleted file mode 100644 index 60fcd810496ba56122d46d5b2237ae7d47f6fa17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1620 zcmb`IYfRH;6vqFE!X!hSVSQ_7APXpjarkLb;T-E6X%X%swpHmy_rHa-QUU&hMP- zL4gQkquoXT02uon_xTn8^cHnG>LUYPP2@f%1Au{rpU>AJmx|>h;mII;I}qg6_4!cP z!-#gRa2>nX=0HWR-?Ba0zE&Zo+n!^Tz5xQRJbb8KUsVhNnFUIvKo0Ehi;J$#7a6ooc+?d#2dDSGMj`n=SMF4$pe-#}eZt!gjm` zUvL4WL$i)fp|q9~2bj0v)fjpso#Jb3Y?+u|qj=f}}n77<2SpG(~d zTuS#wzf?e95}dU{Qnn21ynl7#3TL%Rk*s1!0W)jUhTTS-9*~x|K4arbOt2p zJWjqdYQux<#)1+0*a{Y$%vwLp_nSjlJ86zmjByoW#&iu&R{ z^JYAVn}XNE)iG*cg{gdswzq2V=>UU{0dYC?>OxFQY#^}~&O$o=gd_Wo^$c7hj40RS zJb!|5%sfIJofd=17vIJl$j4jsw div { diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index a179935ad4..b96468550a 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -155,7 +155,7 @@ display: inline; margin: 0 15px 0 0; float: left; - font-size: 11px; + font-size: $smallFontSize; color: $workzoneToolsLabelColor; line-height: 22px; vertical-align: middle; diff --git a/resources/www/setup/styles/main.scss b/resources/www/setup/styles/main.scss index c36b2c4b3b..e1e71f6c80 100644 --- a/resources/www/setup/styles/main.scss +++ b/resources/www/setup/styles/main.scss @@ -1,8 +1,8 @@ $iconsPath: '../../../assets/common/images/icons/'; - +@import '../../_shared/styles/variables'; body, html { - font-family: Helvetica, Verdana, Arial, sans-serif; - font-size: 13px; + font-family: $defaultFontFamily; + font-size: $mediumFontSize; color: white; background-color: #000000; } diff --git a/templates/web/overview.html.twig b/templates/web/overview.html.twig index fcbcd54c2a..effe825767 100644 --- a/templates/web/overview.html.twig +++ b/templates/web/overview.html.twig @@ -8,40 +8,36 @@ {% block stylesheet %} {% endblock %} diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index 858a8c1a2a..627f65aba8 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -78,7 +78,7 @@ {% set i = field.get_id() %} {% if field.is_readonly() is empty %}
- + {% if field.get_dces_element %} {{ 'Ce champ est decrit comme un element DublinCore' | trans }} diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index f84706fb66..1749aa4010 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -69,7 +69,7 @@ - ▼ + diff --git a/templates/web/prod/templates/upload.html.twig b/templates/web/prod/templates/upload.html.twig index 81d4029b58..255954119c 100644 --- a/templates/web/prod/templates/upload.html.twig +++ b/templates/web/prod/templates/upload.html.twig @@ -35,7 +35,7 @@

- +