diff --git a/html/ajax.php b/html/ajax.php index ea0a84fe6..1a24adc7a 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -15,6 +15,7 @@ if ( ! defined ('ALLOWED') ) define ('ALLOWED',1); require_once '../include/constant.php'; require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/class/extension.class.php'; if ( !isset ($_REQUEST['gDossier'])) exit(); diff --git a/html/ajax_misc.php b/html/ajax_misc.php index d2c7e2ff3..3c4e80e0c 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -45,6 +45,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; $http=new HttpInput(); mb_internal_encoding("UTF-8"); diff --git a/html/do.php b/html/do.php index 54959adf3..2125c714b 100644 --- a/html/do.php +++ b/html/do.php @@ -32,6 +32,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/constant.security.php'; require_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; $http=new HttpInput(); mb_internal_encoding("UTF-8"); diff --git a/html/image/fontello/fontello.eot b/html/image/fontello/fontello.eot new file mode 100644 index 000000000..b1e33b84a Binary files /dev/null and b/html/image/fontello/fontello.eot differ diff --git a/html/image/fontello/fontello.svg b/html/image/fontello/fontello.svg new file mode 100644 index 000000000..ce270cb1a --- /dev/null +++ b/html/image/fontello/fontello.svg @@ -0,0 +1,150 @@ + + + +Copyright (C) 2018 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/html/image/fontello/fontello.ttf b/html/image/fontello/fontello.ttf new file mode 100644 index 000000000..5cc022c41 Binary files /dev/null and b/html/image/fontello/fontello.ttf differ diff --git a/html/image/fontello/fontello.woff b/html/image/fontello/fontello.woff new file mode 100644 index 000000000..ed94d115e Binary files /dev/null and b/html/image/fontello/fontello.woff differ diff --git a/html/image/fontello/fontello.woff2 b/html/image/fontello/fontello.woff2 new file mode 100644 index 000000000..88cd73057 Binary files /dev/null and b/html/image/fontello/fontello.woff2 differ diff --git a/html/js/card.js b/html/js/card.js index 1228ac2c5..33a7624fd 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -166,7 +166,8 @@ function action_add_concerned_card(obj) 'query' : inp, 'ctl' : 'unused', 'ag_id' : ag_id, - 'op':'card' + 'op':'card', + 'accvis':0 }); waiting_box(); diff --git a/html/js/scripts.js b/html/js/scripts.js index 95f4bc132..38310dc52 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -1074,13 +1074,15 @@ function show_calc() } var sid = 'calc1'; var shtml = ''; - shtml += '
X
'; - shtml += '

Calculatrice

'; + shtml +="
"; + shtml += ' X'; + shtml +="
"; + shtml += '

Calculatrice

'; shtml += '
Calculatrice simplifiée: écrivez simplement les opérations que vous voulez puis la touche retour. exemple : 1+2+3*(1/5) '; shtml += '
Taper une formule (ex 20*5.1) puis enter '; var obj = {id: sid, html: shtml, - drag: false, style: '' + drag: false, style: 'z-index:98' }; add_div(obj); this.document.getElementById('inp').focus(); @@ -2077,7 +2079,6 @@ function view_action(ag_id, dossier, modify) var pos = fixed_position(0, 50) + ";width:90%;left:5%;"; add_div({ id: id, - drag: 1, cssclass: "inner_box", style: pos }); @@ -2874,16 +2875,17 @@ function create_anchor_up() function init_scroll() { var up=new Element('div',{"class":"inner_box", - "style":"padding:10px;left:auto;width:60px;height: auto;display:none;position:fixed;top:25px;right:20px;text-align:center", + "style":"padding:5px;left:auto;width:auto;height: auto;display:none;position:fixed;top:25px;right:50px;text-align:center", id:"go_up" }); - up.innerHTML=' '; + up.innerHTML=' '; document.body.appendChild(up); window.onscroll=function () { if ( document.viewport.getScrollOffsets().top> 0) { if ($('go_up').visible() == false) { - $('go_up').setOpacity(0.85); + $('go_up').setOpacity(0.70); $('go_up').show(); + $('go_up').style.zIndex=99; } } else { $('go_up').hide(); @@ -2986,14 +2988,14 @@ function pin (object_id) { if ( aDraggableElement[object_id]) { aDraggableElement[object_id].destroy(); aDraggableElement[object_id]=undefined; - $('pin_'+object_id).firstChild.innerHTML="⊕"; + $('pin_'+object_id).innerHTML=""; } else { aDraggableElement[object_id]=new Draggable(object_id, {starteffect: function () { new Effect.Highlight(object_id, {scroll: window, queue: 'end'}); }} ); - $('pin_'+object_id).firstChild.innerHTML="≊"; + $('pin_'+object_id).innerHTML=""; } } /** diff --git a/html/js/todo_list.js b/html/js/todo_list.js index d073033b7..09510c42f 100644 --- a/html/js/todo_list.js +++ b/html/js/todo_list.js @@ -47,7 +47,7 @@ function todo_list_show(p_id) { try { - var todo_div=create_div({id:'todo_list_div'+p_id,cssclass:'add_todo_list',drag:1}); + var todo_div=create_div({id:'todo_list_div'+p_id,cssclass:'add_todo_list'}); diff --git a/html/recherche.php b/html/recherche.php index ca07a9c6a..460a67475 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -26,6 +26,7 @@ require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; html_page_start($_SESSION['g_theme']); diff --git a/html/style-classic.css b/html/style-classic.css index baf4a2c37..ee493c1ba 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -7,6 +7,18 @@ src: url('image/OpenSansRegular.eot'); src: local('OpenSansRegular'), url('image/OpenSansRegular.woff') format('woff'), url('image/OpenSansRegular.ttf') format('truetype'); } + +@font-face { + font-family: 'fontello'; + src: url('image/fontello/fontello.eot?18582275'); + src: url('image/fontello/fontello.eot?18582275#iefix') format('embedded-opentype'), + url('image/fontello/fontello.woff?18582275') format('woff'), + url('image/fontello/fontello.ttf?18582275') format('truetype'), + url('image/fontello/fontello.svg?18582275#fontello') format('svg'); + font-weight: normal; + font-style: normal; + } + /* use this class to attach this font to any element i.e.

Text with this font applied

*/ .fontsforweb_fontid_38327 { font-family: 'OpenSansRegular' !important; @@ -1250,37 +1262,6 @@ a.line:hover,div_content a.line color: #FFFFFF; background-color:#336699; } -#close_div -{ - color:white; - text-decoration:none; - margin-left: 2px; - margin-right:6px; - margin-top:0px; - font-size:14px; - font-size:1rem; - cursor: pointer; - border:0px; -} -#close_div:hover -{ - background-color: #F93; -} -#popmeout -{ - background-color:#FFFFFF; - color:#0000FF; - text-decoration:none; - border:1px solid #0000FF; - margin-left: 2px; - margin-right:18px; - font-size:12px; - font-size: 0.75rem; -} -#popmeout:hover -{ - background-color: #F93; -} table.table_large tr.odd ,table.table_large tr.even { height:32px; @@ -2265,4 +2246,36 @@ span.inplace_edit_input margin-right:5px; padding-top:0px; margin-top:0px; +} +/** + * For the icon (font-famillo fontello) + */ +.icon { + font-family: "fontello"; + font-weight:normal; + cursor: pointer; +} +.icon:hover { + font-family: "fontello"; +} +/** + * Icon in the title of Box + */ +div.bxbutton .icon +{ + color:white; + text-decoration:none; + margin-left: 6px; + margin-right:6px; + /*! padding-top:10px; */ + font-size:14px; + font-size:1rem; + cursor: pointer; + border:0px; + height: 18px; +} +div.bxbutton .icon:hover +{ + background-color: white; + color: blue; } \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index 44cf3036c..8875abe15 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -11,6 +11,16 @@ .fontsforweb_fontid_38327 { font-family: 'OpenSansRegular' !important; } +@font-face { + font-family: 'fontello'; + src: url('image/fontello/fontello.eot?18582275'); + src: url('image/fontello/fontello.eot?18582275#iefix') format('embedded-opentype'), + url('image/fontello/fontello.woff?18582275') format('woff'), + url('image/fontello/fontello.ttf?18582275') format('truetype'), + url('image/fontello/fontello.svg?18582275#fontello') format('svg'); + font-weight: normal; + font-style: normal; + } BODY { font-family: Arial, Helvetica, "Liberation Sans" , FreeSans, sans-serif; @@ -1232,37 +1242,7 @@ a.line:hover,div_content a.line color: #FFFFFF; background-color:#336699; } -#close_div -{ - color:white; - text-decoration:none; - margin-left: 2px; - margin-right:6px; - margin-top:0px; - font-size:14px; - font-size:1rem; - cursor: pointer; - border:0px; -} -#close_div:hover -{ - background-color: #F93; -} -#popmeout -{ - background-color:#FFFFFF; - color:#0000FF; - text-decoration:none; - border:1px solid #0000FF; - margin-left: 2px; - margin-right:18px; - font-size:12px; - font-size: 0.75rem; -} -#popmeout:hover -{ - background-color: #F93; -} + table.table_large tr.odd ,table.table_large tr.even { height:32px; @@ -2188,4 +2168,36 @@ span.inplace_edit_input margin-right:5px; padding-top:0px; margin-top:0px; +} +/** + * For the icon (font-famillo fontello) + */ +.icon { + font-family: "fontello"; + font-weight:normal; + cursor: pointer; +} +.icon:hover { + font-family: "fontello"; +} +/** + * Icon in the title of Box + */ +div.bxbutton .icon +{ + color:white; + text-decoration:none; + margin-left: 6px; + margin-right:6px; + /*! padding-top:10px; */ + font-size:14px; + font-size:1rem; + cursor: pointer; + border:0px; + height: 18px; +} +div.bxbutton .icon:hover +{ + background-color: white; + color: blue; } \ No newline at end of file diff --git a/html/style-mandarine.css b/html/style-mandarine.css deleted file mode 100644 index 1824b98f6..000000000 --- a/html/style-mandarine.css +++ /dev/null @@ -1,2166 +0,0 @@ - /* */ -#add_todo_list { - border:1px solid #FF7F50; - display:none; - background-color:#FFCC99; - padding:0.07%; - position:absolute; - text-align:left; - z-index:1; - width: 480px; - width:30rem; - height:auto; -} -div.welcome { - -} -div.gest_name { - float:left; - margin-left:150px; - margin-top:15px; -} -h2.gest_name { - border-left: 5px solid #403a8d; - border-bottom:1px solid #b4bbc2; - border-top:1px solid #b4bbc2; - border-right:1px solid #b4bbc2; - padding: 5px; - width: 40%; -} -body.op_detail_frame,div.op_detail_frame { - background-color: #FFF1ED; - height:100%; width:100%; --moz-box-shadow: 10px 10px 5px #888; --webkit-box-shadow: 10px 10px 5px #888; -box-shadow: 10px 10px 5px #888; - - -} -div.inner_box { - background-color: #FAF3EC; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:2px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - left:10%; - border:1px solid #6D3F2E; --moz-box-shadow: 10px 10px 5px #888; --webkit-box-shadow: 10px 10px 5px #888; -box-shadow: 10px 10px 5px #888; -font-size:14.4px; -font-size:0.90rem; - width: 95%; -} -@media only screen and (min-width: 1281px) { -div.inner_box { - width: 85%; - } -} -@media only screen and (max-width: 1280px) { -div.inner_box { - width: 95%; - left:2%; - margin-bottom: 2%; - } -} -div.op_detail_title { - background-color:#888; - /* width:500;*/ - - -} - -div#div_cat{ - position:absolute; - border:1px solid #000000; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#FFFFCC; - -} - -div.divinfo -{ - color:#FF0000; - text-align:right; - display:block; - width: 480px; - width:30rem; - height:13px; - font-weight:bold; -} - -div#search_form -{ - position:absolute; - border:1px solid #000000; - top:15%;left:100px; - margin-left:25%; - z-index:2; - width:50%; - display:none; - background-color:#FFF1ED; - -moz-box-shadow: 10px 10px 5px #888; - -webkit-box-shadow: 10px 10px 5px #888; - box-shadow: 10px 10px 5px #888; -} -@media only screen and (max-width: 995px) { - div#search_form { - width:90%; - margin-left:5%; - left:0px; - } -} - -table.sortable td, table.table_large td, table.result td -{ - padding-left:5px; - padding-right:5px; -} -table.info_op -{ - width:100%; -} -table.info_op tr -{ - background:#FFFFFF; -} -h2#jrn_name -{ - color:#FF7F50; - margin-right:30%; - float: right; -} -tr.footer{ - font-style: italic; - font-weight: bold; - -} -span.remain { - font-weight: bold; - color:#000000; -} -div#jrn_name_div -{ - float: right; - margin-right:150px; - - -} -#predef_form { - margin-left:20%; - width:60%; - position: absolute; -} - -@media only screen and (min-width: 955px) { - div#jrn_name_div - { - float: right; - margin-right:150px; - - - } - #predef_form { - margin-left:20%; - width:60%; - position: absolute; - z-index:1; - } -} -@media only screen and (max-width: 955px) { - div#jrn_name_div - { - display:none; - } - #predef_form { - right:0px; - width:60%; - position: absolute; - z-index:1; - } -} -#direct -{ - display:inline; - float:left; -} -#calc -{ - display:inline; - float:left; -} -div#wait_box -{ - background-color:#FFCC99; - font-family: arial,verdana,helvetica,arial,sans-serif; - width: 300px; - padding:0px; - margin:0px; - overflow:hidden; - z-index:10; - - position:absolute; - left:30%; - top:30%; - - - border:1px solid #6D3F2E; - - width: 260px; - widt: 260px; -} -#wait_box h2 -{ - /* color:#000000; */ - text-align:center; - /* width: 50%; */ -} -div#div_jrnsearch_op{ - - border:1px solid #000000; - width: 800px; - width:50rem; - background-color:#FFFFCC; - z-index: 5; - -} -ul { - padding-left: 110px; -} -a.line,div.content a.line -{ - text-decoration:underline; - display:inline; - cursor: pointer; - - /* color: #FF7F50; */ -} -a.line:hover,div_content a.line -{ - text-decoration:underline; - display:inline; - color: #FFFFFF; - background-color:#336699; -} -#close_div -{ - color:white; - text-decoration:none; - margin-left: 2px; - margin-right:2px; - margin-top:3px; - font-size:12px; - font-size:0.90rem; - cursor: pointer; - cursor: pointer; - border:0px; - font-size:20px; -} -#close_div:hover -{ - background-color: #F93; -} -#popmeout -{ - background-color:#FFFFFF; - color:#FF7F50; - text-decoration:none; - border:1px solid #FF7F50; - margin-left: 2px; - margin-right:18px; - font-size:12px; - font-size: 0.75rem; - cursor: pointer; - -} -#popmeout:hover -{ - background-color: #F93; -} -table.table_large tr.odd ,table.table_large tr.even { - - height:32px; -} -#calc1 -{ - position:absolute; - display:block; - top:30px; - left:150px; - width:300px; - border:1px solid #000000; - background-color:#FFCC99; - padding: 20px 20px; -} -span.invoice -{ - font-style: italic; - display:block; - margin: 20px; - font-weight: bold; -} -a.nav,div.content a.nav,div.redcontent a.nav { - display:inline; - text-decoration:none; - cursor: pointer; - -} -a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover { - display:inline; - text-decoration:none; - background-color:#6D3F2E; - color:#FFFFFF; -} -#dossier { - display:inline; - float:left; - width:100%; - top:0px; - text-align: center; - font-variant:small-caps; - font-weight: bolder; - } -@media only screen and (min-width: 955px) { -#dossier { - display:inline; - float:left; - width:100%; - top:0px; - text-align: center; - font-variant:small-caps; - font-weight: bolder; - } -} -@media only screen and (max-width: 955px) { -#dossier { - display:inline; - float:left; - width:100%; - top:0px; - text-align: left; - font-variant:small-caps; - font-weight: bolder; - } -} - -div.foldercontent { - font-size:14px; - font-size:0.95rem; - width: 80%; - margin-left: 10%; -} - -h1.title { - color: #FF7F50; - font-style: italic; - text-align:center; - text-transform: uppercase; -} -h2.title { -/* - background: -moz-linear-gradient(top, rgba(242,130,91,0.94) 0%, rgba(229,91,43,0.98) 62%, rgba(240,113,70,0.99) 73%, rgba(240,113,70,1) 100%); FF3.6+ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(242,130,91,0.94)), color-stop(62%,rgba(229,91,43,0.98)), color-stop(73%,rgba(240,113,70,0.99)), color-stop(100%,rgba(240,113,70,1))); Chrome,Safari4+ - background: -webkit-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); Chrome10+,Safari5.1+ - background: -o-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); Opera 11.10+ - background: -ms-linear-gradient(top, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); IE10+ - background: linear-gradient(to bottom, rgba(242,130,91,0.94) 0%,rgba(229,91,43,0.98) 62%,rgba(240,113,70,0.99) 73%,rgba(240,113,70,1) 100%); W3C - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f0f2825b', endColorstr='#f07146',GradientType=0 ); IE6-9 */ -/* Other test */ -/*background: #feccb1; Old browsers -background: -moz-linear-gradient(top, #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); FF3.6+ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#feccb1), color-stop(50%,#f17432), color-stop(51%,#ea5507), color-stop(100%,#fb955e)); Chrome,Safari4+ -background: -webkit-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); Chrome10+,Safari5.1+ -background: -o-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); Opera 11.10+ -background: -ms-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); IE10+ -background: linear-gradient(to bottom, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); W3C -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); IE6-9 */ - background: rgb(255,100,86); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(255,100,86,1) 11%, rgba(207,4,4,1) 67%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(11%,rgba(255,100,86,1)), color-stop(67%,rgba(207,4,4,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(255,100,86,1) 11%,rgba(207,4,4,1) 67%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(255,100,86,1) 11%,rgba(207,4,4,1) 67%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, rgba(255,100,86,1) 11%,rgba(207,4,4,1) 67%); /* IE10+ */ -background: linear-gradient(to bottom, rgba(255,100,86,1) 11%,rgba(207,4,4,1) 67%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff6456', endColorstr='#cf0404',GradientType=0 ); /* IE6-9 */ - color:#FFFFFF; - text-align:center; - padding:0.24%; - border:1px solid #6D3F2E; - -} -h3.title { - color: #FF7F50; - margin-left: 30px; -} -h4.title { - color: #FF7F50; - margin-left: 45px; - text-decoration: underline; -} -h5.title { - color: #FF7F50; - margin-left: 45px; - text-decoration: none; - font-style: italic; -} -div.myfieldset -{ - margin-top: 5px; - margin-left:5px; - margin-right: 5px; - border:#FFFFCC 2px groove; - border-radius: 4px; -} -#info_div { - display:none; - background-color: #FCFFCC; - color:#000000; - z-index: 15; - position: absolute; - top:0px; - left:45%; -} -div.menu3 { - font-size:13.6px; - font-size:0.85rem; - -} -#go_submit_id { - -} -.decale { - margin-left:30px; -} -#folder { - border-width:1px; - border-collapse: separate; - margin-left: 5%; - width: 90%; - border-radius: 9px; - border-style:solid; - padding : 5px; - border-color: #DF3F3F; -} -#folder tr { - height: 33px; -} -/*#folder tr.odd,#folder tr.even { - font-size : 1.2em; -}*/ -textarea.itextarea{ - border:solid #FF7F50 1px; - width:90%; - margin-left:5%; - height:120px; - color:rgb(165, 42, 42); -} - -div#notice { - position:absolute; - right:5%; - top:200px; - background-color:#FCFFCC; - border: 1px solid #000000; -} -div.name { - position:absolute; - top:0px; - left:0px; - display:block; -} -div#modele_op_div{ - display: none; - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:0px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - left: 10%; - border:1px solid #6D3F2E; - width: 80%; -} -@media only screen and (min-width: 955px) { - div.name { - position:absolute; - top:0px; - left:0px; - display: block; - } - div#modele_op_div{ - display: none; - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:0px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - left: 17.5%; - border:1px solid #6D3F2E; - width: 75%; -} -} -@media only screen and (max-width: 955px) { - div.name { - position:absolute; - top:0px; - left:0px; - display:none; - } - div#modele_op_div{ - display: none; - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:0px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - left: 10%; - border:1px solid #6D3F2E; - width: 80%; -} -} - -div#box_search_card { - position:absolute; - right:15.625%; - top:115px; -} -div.bxbutton -{ - float:right; - height:10px; - display:block; - margin-right:0.48%; - margin-top:3px; -} -div.inner_box tr.odd { -} -#modele_op_tab tr.odd { - background: #FFFFCC; -} -div#bookmark_div { - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:2px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - border:1px solid #6D3F2E; - top:32px; - top:2rem; - left:30%; - width:40%; -} -div#preference_div { - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - padding:0px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - border:1px solid #6D3F2E; - top:32px; - top:2rem; - left:20%; - width:50%; -} -#error_div{ - position:absolute; - border:1px solid #000000; - background-color:#FFCC99; - padding-bottom: 2px; - padding-top: 2px; - padding-left: 2px; - padding-right: 2px; - color:#FF0000; - top:40%;left:25%; - visibility:hidden; - width: 640px; - width:40rem; - z-index:20; -} -#error_div h2 { - background: #FF0000; -} -div#error_content_div { - color:#FF0000; - font-weight: bold; - text-align: center; -} -td.workday ol { - margin:0px; - padding:0px; - list-style-type:none; - text-align:left; -} -input.inum { - text-align:right; - border:1px solid #FF7F50; - margin:2px -} -div.box { - background-color:#FFF1ED; - font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica; - margin-top:10px; - margin-left:3px; - margin-right:3px; - padding:2px; - overflow:hidden; - border:1px solid #6D3F2E; - width:30%; - height:350px; - float:left; - font-size:14px; - font-size:0.90rem; -} -@media only screen and (max-width: 1426px) { - div.box { - width: 48%; - height: 380px; - } -} -@media only screen and (max-width: 955px) { - div.box { - width: 95%; - - height: 380px; -} -} -div.box table{ - border-spacing:0px; -} -div.box tr.odd { - background-color: #FFF1ED; - -} -div.box tr.even { - background-color:#FFF1ED; - -} -#jrn_name_div h2{ - font-size:38.4px; - font-size: 2.4rem; -} -#search_account { - width: 70%; -} -fieldset { - border-width: 1px; -} -#tva_select table { - border-spacing: 0px; -} -a { - color: brown; -/* text-decoration: underline; */ - cursor: pointer; -} -#mod_predf_op { - width: 80%; - overflow: auto; - overflow-style: panner; -} -hr { - color : orangered; - background-color : orangered; - width : 75%; - border-width:2px; - border-style:solid; - margin-left: 12.5% -} - -/**************************************************************************** - * Aligned button - ****************************************************************************/ -ul.aligned-block { - padding:5px; - display : block; -} -ul.aligned-block li { - display:table-cell; - padding : 10px; - list-style: none; -} -/**************************************************************************** - * Tabs - ****************************************************************************/ -ul.tabs { - padding-top: 15px; - display:block; - - padding-left: 2px -} -ul.tabs a { - display:inline; -} -li.tabs_selected { - display:inline; - background: #F9C5B6; /* Old browsers */ - border-top-left-radius: 10px; - border-top-right-radius: 10px; - margin-left: 5px; - padding: 20px 15px 0px 15px; - border:1px red solid; - float: left; -} - -li.tabs,li.tabs:hover{ - display:inline; - margin-left: 2px; - border-top-right-radius: 10px; - padding: 15px 15px 0px 15px; - border:1px red solid; - color:rgb(165, 42, 42); - float: left; - background-color: #FFF1ED; - margin-top: 8px; -} -li.tabs { - /*! background-color: inherit; */ - -} -li.tabs:hover { - background-color: pink; - color:wheat; - border:1px orange solid; - -} -ul.tabs a { - text-decoration: none; - color:inherit; - display:inline; - white-space: nowrap; - -} -ul.tabs a:hover { - text-decoration: none; - color:red; - display:inline; - background-color: pink; - white-space: nowrap; -} -@media only screen and (max-width: 1426px) { - li.tabs_selected { - padding: 8px 10px 10px 10px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - } - li.tabs , li.tabs:hover { - padding: 10px 10px 0px 10px; - } -} -@media only screen and (max-width: 955px) { - li.tabs_selected { - padding: 1px 1px 1px 1px; - border-top-left-radius: 0px; - border-top-right-radius: 0px; - } - li.tabs , li.tabs:hover { - padding: 1px 1px 1px 1px; - } -} -/***************************************************************************** - * Second row of menu - *****************************************************************************/ -div.menu2 a.mtitle{ - font-size:13.6px; - font-size:0.85rem; - padding-left: 2%; - padding-right: 2%; -} - -div.menu2 table.mtitle td.mtitle { - border:0px; - background:inherit; - color:white; - /* width: 10rem; */ - border-spacing: 12px; - border-bottom: 2px #E95353 solid; - border-radius: 0px; - -} -div.menu2 table.mtitle td.mtitle a.mtitle { - color:red; - padding-left: 2%; - padding-right: 2%; - cursor:pointer; -} -/***************************************************************************** - * Table of one column to present menu - * as in CFGLED, FORECAST, REPORT - *****************************************************************************/ -table.vert_mtitle { - text-align:center; - /* border:5px solid #99B1DF; */ - border-radius:5px; - width:80%; - margin-left: 10%; - border-collapse: separate; - border-spacing: 10px; - - -} -table.vert_mtitle td.first { - background-color: #FFBC93; - color:#DF3F3F; -} -table.vert_mtitle td.first a { - background-color: #FFBC93; - color:#DF3F3F; -} -table.vert_mtitle td { - border : 1px solid #99B1DF; - background-color:#FFD4BA; - border-top-radius:20px; -} -table.vert_mtitle td a{ - padding : 20px; - font-weight: bold; -} -table.vert_mtitle td:hover { - border : 1px solid #99B1DF; - background-color: #336699; - color:white; -} -table.vert_mtitle td:hover a{ - color:white; - -} -/******************************************************************************* - * Tiny button example : -X for remove action, remove link... - *******************************************************************************/ -div.content a.tinybutton{ - color: red; - font-weight: bold; - text-decoration: none; - font-family: arial,verdana,sans-serif,helvetica; - font-size: 8px; - font-size: 0.7rem; - padding-bottom: 0px; - padding-top: 0px; - padding-right: 0px; - padding-left: 0px; - margin-top: 3px; - cursor: pointer; - margin: 1px 2px 1px 2px; - border-width: 1px; - border-style: solid; - - border-radius: 2px; - display : inline; -} -input[type="button"].tinybutton { - color: red; - font-weight: blue; - text-decoration: none; - font-family: arial,verdana,sans-serif,helvetica; - font-size: 8px; - font-size: 0.7rem; - padding-bottom: 0px; - padding-top: 0px; - padding-right: 0px; - padding-left: 0px; - margin-top: 3px; - cursor: pointer; - margin: 1px 2px 1px 2px; - border-width: 1px; - border-style: solid; - border-color: red; - border-radius: 2px; - display : inline; - background-color:white; -} -/******************************************************************************* - Image Search -*******************************************************************************/ -.image_search { - cursor:pointer; - width:16px; - height:16px; - vertical-align: top; - border-radius: 2px; - - border-width: 1px; - border-color: #6D3F2E; - background: #feccb1; /* Old browsers */ -background: -moz-linear-gradient(top, #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#feccb1), color-stop(50%,#f17432), color-stop(51%,#ea5507), color-stop(100%,#fb955e)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* IE10+ */ -background: linear-gradient(to bottom, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); /* IE6-9 */ - - padding : 3px; - -} -/****************************************************************************** - * Hightlight row in a table - ******************************************************************************/ -li.highlight a,tr.highlight{ - font-weight: bolder; - font-size:14px; - background-color: lightgrey ! important; - color:orangered !important; - border-width: 0px; - border-style: solid; - border-color: inherit; - -} -li.highlight a,tr.highlight a{ - color:white !important; - background-color:grey !important; - -} -/*--- Top menu and menu2-*/ -div.topmenu a.mtitle , div.menu2 a.mtitle{ - font-size:13.6px; - font-size:0.85rem; - color:red; -} -div.topmenu a.mtitle:hover,div.menu2 a.mtitle:hover{ - color:red; - background-color: transparent; -} -div.topmenu td.selectedcell a.mtitle, div.menu2 a.mtitle{ - font-size:13.6px; - font-size:0.85rem; -} -*|*:link { - color: inherit; -} -/****************************************************************************** - * Total in confirmation VEN / ACH - ******************************************************************************/ -#total_div_id { - float: right; - margin-right: 150px; - background: snow; - margin-top: 50px; -} -/******************************************************************************* - * For TODO List - *******************************************************************************/ -#add_todo_list , div.add_todo_list { - border:1px solid #0000FF; - background-color:#FFCCCC; - padding:0.07%; - position:absolute; - text-align:left; - z-index:1; - width:480px; - width:30rem; - height:auto; -} -/*************************************************************************** - * column in the dashboard - ***************************************************************************/ -td.cut { - max-width: 25%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -td.box { - border-left : #C76626 solid 1px; -} - -/**************************************************************************** -* Smoke appearance of modal box - ****************************************************************************/ -.smoke-base { - position: fixed; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - visibility: hidden; - opacity: 0; - background: rgba(0,0,0,.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#90000000,endColorstr=#900000000); -} - -.smoke-base.smoke-visible { - opacity: 1; - visibility: visible; -} - -.smokebg { - position: fixed; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; -} - -.smoke-base .dialog { - position: absolute; - top: 25%; - width: 40%; - left: 50%; - margin-left: -20%; -} - -.dialog-prompt { - margin-top: 15px; - text-align: center; -} - -.dialog-buttons { - margin: 20px 0px 5px 0px -} - -.smoke { - text-align: center; - background-color:#FFF1ED ; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - - padding:2px; - margin:0px; - overflow:hidden; - z-index:3; - position:absolute; - left:10%; - border:1px solid #white; --moz-box-shadow: 10px 10px 5px #888; --webkit-box-shadow: 10px 10px 5px #888; -box-shadow: 10px 10px 5px #888; -font-size:14.4px; -font-size:0.90rem; -width: 85%; -} -.dialog-buttons button:hover{ - color:beige; - font-weight: bold; -} -.dialog-buttons button { - color:#FFFFFF; - font-weight: normal; - text-decoration:none; - - border-color: #6D3F2E; - background: #feccb1; /* Old browsers */ -background: -moz-linear-gradient(top, #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#feccb1), color-stop(50%,#f17432), color-stop(51%,#ea5507), color-stop(100%,#fb955e)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* IE10+ */ -background: linear-gradient(to bottom, #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); /* IE6-9 */ - border-color: #605D5D; - border-width:0px; - padding:4px; - margin:3px; - cursor:pointer; - margin:1px 2px 1px 2px; - border-radius: 5px; - moz-border-radius:5px; - width:7em; - width:7rem; -} - -.dialog-prompt input { - margin: 0; - border: 0; - font-family: sans-serif; - outline: none; - font-family: Menlo, 'Andale Mono', monospace; - border: 1px solid #aaa; - width: 75%; - display: inline-block; - background-color: transparent; - font-size: 16px; - padding: 8px; -} - -.smoke-base .dialog-inner { - padding: 15px; - - color:#202020; -} - -button.cancel { - background-color: rgba(0,0,0,.50); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#2000,endColorstr=#444444); -} - -.queue{ - display:none; -} - -/***************************************************************************** - * autocomplete style - *****************************************************************************/ - -div.autocomplete_fixed { - background-color:#FFFFFF; - border:1px solid #C76626; - margin:0px; - padding:0px; - text-align:left; -} -div.autocomplete_fixed em { - color: #C76626; - font-weight:bold; -} -div.autocomplete_fixed ul { - list-style-type:none; - background-color:#FFFFFF; - border:1px solid blue; - width:300px; - margin:0px; - padding:0px; - } -div.tag { - -} -@media only screen and (max-width: 1280px) { - div.autocomplete_fixed ul { - list-style-type:none; - background-color:#FFFFFF; - border:1px solid blue; - width:300px; - margin:0px; - padding:0px; - } - div.tag { - - } - -} -@media only screen and (min-width: 1281px) { - div.autocomplete_fixed ul { - list-style-type:none; - background-color:#FFFFFF; - border:#EF5F2B 1px solid; - width:500px; - margin:0px; - padding:0px; - } - div.tag { - width: 50%; - } - - -} -div.autocomplete_fixed ul li.selected { - background-color: #feccb1; - border-bottom: #000000 1px solid ; -} - -div.autocomplete_fixed ul li { - list-style-type:none; - display:block; - margin:0px; - padding:0px; - cursor:pointer; -} - -/* - * Menu selected when configuring the profile - */ - -td.selectedmenu { - background-color: #FDF5E6; -} -.field_follow_up -{ - margin-top:1px; - white-space: -moz-pre-wrap; - white-space: pre-wrap; - border:1px solid orangered; - width:95%; -} -/** - * go_up -*/ -#go_up { - background-color: transparent; - border:0px; - font-size:300%; - box-shadow: none; - color:orange; - -} -#go_up a ,#go_up a:visited{ - background-image: none; - text-decoration: none; - color:orange; -} - -/* - * Summary of operation , contains miscelleneous informations - * before confirming sale , purchase - */ -#summary_op1,#summary_op2 -{ - position:float; - float:left; - padding-left: 150px; -} -/* - * Style for the Inplace Edit element - */ -span.inplace_edit -{ - text-decoration: underline; - cursor: pointer; -} -span.inplace_edit_input -{ - text-decoration: none; - font-size: 110%; - cursor: none; -} \ No newline at end of file diff --git a/html/style-mobile.css b/html/style-mobile.css deleted file mode 100644 index d1d9e0243..000000000 --- a/html/style-mobile.css +++ /dev/null @@ -1,2006 +0,0 @@ -/* */ -#add_todo_list, div.add_todo_list { - border: 1px solid #605D5D; - background-color: #DDE6FF; - padding: 0.07%; - position: absolute; - text-align: left; - z-index: 1; - width: 480px; - width: 30rem; - height: auto; -} -div.gest_name { - float: left; - margin-left: 150px; - margin-top: 15px; -} -h2.gest_name { - border-left: 5px solid #403a8d; - border-bottom: 1px solid #b4bbc2; - border-top: 1px solid #b4bbc2; - border-right: 1px solid #b4bbc2; - padding: 5px; - width: 40%; -} -body.op_detail_frame, div.op_detail_frame { - background-color: #e4e7ed; - height: 100%; - width: 100%; - -moz-box-shadow: 10px 10px 5px #888; - -webkit-box-shadow: 10px 10px 5px #888; - box-shadow: 10px 10px 5px #888; -} -div.inner_box { - background-color: #DCE1EF; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 2px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - left: 10%; - border: 1px solid #00008B; - font-size: 12px; - width: 85%; -} -@media only screen and (min-width: 1281px) { - div.inner_box { - width: 85%; - } -} -@media only screen and (max-width: 1280px) { - div.inner_box { - width: 95%; - left: 2%; - margin-bottom: 2%; - } -} -div.op_detail_title { - background-color: #888; - /* width:500;*/ - -} -div#div_cat { - position: absolute; - border: 1px solid #000000; - top: 15%; - left: 100; - visibility: hidden; - z-index: 2; - width: 50em; - background-color: #EDF3FF; -} -div.divinfo { - color: #FF0000; - text-align: right; - display: block; - width: 480px; - width: 30rem; - height: 13px; - font-weight: bold; -} -div#search_form { - position: absolute; - border: 1px solid #000000; - top: 15%; - left: 100px; - z-index: 2; - width: 50%; - display: none; - background-color: #e4e7ed; - -moz-box-shadow: 10px 10px 5px #888; - -webkit-box-shadow: 10px 10px 5px #888; - box-shadow: 10px 10px 5px #888; - width: 90%; -} -@media only screen and (max-width: 995px) { - div#search_form { - width: 90%; - margin-left: 5%; - left: 0px; - } -} -table.sortable td, table.table_large td, table.result td { - padding-left: 5px; - padding-right: 5px; -} -table.info_op { - width: 100%; -} -table.info_op tr { - background: #FFFFFF; -} -h2#jrn_name { - color: #605D5D; - margin-right: 30%; - float: right; -} -tr.footer { - font-style: italic; - font-weight: bold; -} -span.remain { - font-weight: bold; - color: #000000; -} -div#jrn_name_div { - float: right; - margin-right: 150px; -} -#predef_form { -} -@media only screen and (min-width: 955px) { - div#jrn_name_div { - float: right; - margin-right: 150px; - } - #predef_form { - } -} -@media only screen and (max-width: 955px) { - -} -#direct { - display: inline; - float: left; -} -#calc { - display: inline; - float: left; -} -div#wait_box { - background-color: #DDE6FF; - font-family: arial, verdana, helvetica, arial, sans-serif; - width: 300px; - padding: 0px; - margin: 0px; - overflow: hidden; - z-index: 10; - position: absolute; - left: 30%; - top: 30%; - border: 1px solid #00008B; - width: 260px; - widt: 260px; -} -#wait_box h2 { - /* color:#000000; */ - - text-align: center; - /* width: 50%; */ - -} -div#div_jrnsearch_op { - border: 1px solid #000000; - width: 800px; - width: 50rem; - background-color: #EDF3FF; - z-index: 5; -} -ul { - padding-left: 110px; -} -a.line, div.content a.line { - text-decoration: underline; - display: inline; - /* color: #605D5D; */ - -} -a.line:hover, div_content a.line { - text-decoration: underline; - display: inline; - color: #FFFFFF; - background-color: #336699; -} -#close_div { - text-decoration: none; - border: 0px; - margin-left: 2px; - margin-right: 2px; - margin-top: 2px; - font-size: 12px; - color: red; -} -#close_div:hover { - background-color: #DCE1EF ; -} -#popmeout { - background-color: #FFFFFF; - color: #605D5D; - text-decoration: none; - border: 1px solid #605D5D; - margin-left: 2px; - margin-right: 18px; - font-size: 12px; - font-size: 0.75rem; -} -#popmeout:hover { - background-color: #F93; -} -table.table_large tr.odd, table.table_large tr.even { - height: 32px; -} -#calc1 { - position: absolute; - display: block; - top: 30px; - left: 150px; - width: 300px; - border: 1px solid #000000; - background-color: #aec3e8; - padding: 20px 20px; -} -span.invoice { - font-style: italic; - display: block; - margin: 20px; - font-weight: bold; -} -a.nav, div.content a.nav, div.redcontent a.nav { - display: inline; - text-decoration: none; -} -a.nav:hover, div.content a.nav:hover, div.redcontent a.nav:hover { - display: inline; - text-decoration: none; - background-color: #00008B; - color: #FFFFFF; -} -#dossier { - display: inline; - float: left; - width: 100%; - top: 0px; - text-align: center; - font-variant: small-caps; - font-weight: bolder; - text-transform: full-width; - text-transform: fullwidth; - font-size: 150%; -} -@media only screen and (min-width: 955px) { - #dossier { - display: inline; - float: left; - width: 100%; - top: 0px; - text-align: center; - font-variant: small-caps; - font-weight: bolder; - text-transform: full-width; - text-transform: fullwidth; - font-size: 150%; - } -} -@media only screen and (max-width: 955px) { - #dossier { - display: inline; - float: left; - width: 100%; - top: 0px; - text-align: left; - font-variant: small-caps; - font-weight: bolder; - text-transform: full-width; - } -} -div.foldercontent { - font-size: 14px; - font-size: 0.95rem; - width: 80%; - margin-left: 10%; -} -h1.title { - color: #605D5D; - font-style: italic; - text-align: center; - text-transform: uppercase; -} -h2.title { - text-align: left; - padding: 0.24%; - padding-left: 0.48%; - font-size: 22px; - font-weight: bold; - font-style: normal; -} -h3.title { - color: #605D5D; - margin-left: 30px; -} -h4.title { - color: #605D5D; - margin-left: 45px; - text-decoration: underline; -} -h5.title { - color: #605D5D; - margin-left: 45px; - text-decoration: none; - font-style: italic; -} -div.myfieldset { - margin-top: 5px; - margin-left: 5px; - margin-right: 5px; - border: #EDF3FF 2px groove; - border-radius: 4px; -} -#info_div { - display: none; - background-color: #FCFFCC; - color: #000000; - z-index: 15; - position: absolute; - top: 0px; - left: 45%; -} -div.menu2 a.mtitle { - font-size: 12px; - /* color:brown; */ - -} -div.menu3 { - font-size: 13.60px; - font-size: 0.85rem; -} -.decale { - margin-left: 30px; -} -#folder { - border-width: 1px; - border-collapse: separate; - margin-left: 5%; - width: 90%; - border-radius: 9px; - border-style: solid; - padding: 5px; -} -#folder tr { - height: 30px; -} -/*#folder tr.odd,#folder tr.even { - font-size : 1.2em; -}*/ -textarea.itextarea { - border: solid #605D5D 1px; - width: 90%; - margin-left: 5%; - height: 120px; -} -div#notice { - position: absolute; - right: 5%; - top: 200px; - background-color: #FCFFCC; - border: 1px solid #000000; -} -div.name { - position: absolute; - top: 0px; - left: 0px; -} -div#modele_op_div { - display: none; - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 0px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - left: 17.5%; - border: 1px solid #00008B; - width: 75%; -} -@media only screen and (min-width: 955px) { - div.name { - position: absolute; - top: 0px; - left: 0px; - } - div#modele_op_div { - display: none; - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 0px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - left: 17.5%; - border: 1px solid #00008B; - width: 75%; - } -} -@media only screen and (max-width: 955px) { - div.name { - position: absolute; - top: 0px; - left: 0px; - display: none; - } - div#modele_op_div { - display: none; - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 0px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - left: 10%; - border: 1px solid #00008B; - width: 80%; - } -} -div#box_search_card { - position: absolute; - right: 15.625%; - top: 115px; -} -div.bxbutton { - float: right; - height: 10px; - display: block; - margin-top: 0.48%; - margin-right: 0.48%; -} -div.inner_box tr.odd { - background: #E5E5E5; -} -#modele_op_tab tr.odd { - background: #EDF3FF; -} -div#bookmark_div { - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 2px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - border: 1px solid #00008B; - top: 32px; - top: 2rem; - left: 30%; - width: 40%; -} -div#preference_div { - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 0px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - border: 1px solid #00008B; - top: 32px; - top: 2rem; - left: 20%; - width: 50%; -} -#error_div { - position: absolute; - border: 1px solid #000000; - background-color: #DDE6FF; - padding-bottom: 2px; - padding-top: 2px; - padding-left: 2px; - padding-right: 2px; - color: #FF0000; - top: 40%; - left: 25%; - visibility: hidden; - width: 640px; - width: 40rem; - z-index: 20; -} -#error_div h2 { - background: #FF0000; -} -div#error_content_div { - color: #FF0000; - font-weight: bold; - text-align: center; -} -td.workday ol { - margin: 0px; - padding: 0px; - list-style-type: none; - text-align: left; -} -input.inum { - text-align: right; - border: 1px solid #605D5D; - margin: 2px; -} -/************************************************************************** -Box dashboard on 3 columns -**************************************************************************/ -div.box { - background-color: #e4e7ed; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - margin-top: 10px; - margin-left: 3px; - margin-right: 3px; - padding: 2px; - overflow: hidden; - border: 1px solid #00008B; - width: 30%; - height: 350px; - float: left; - font-size: 14px; - font-size: 0.90rem; -} -@media only screen and (max-width: 1426px) { - /* Dashboard on 2 cols */ - div.box { - width: 48%; - height: 380px; - } -} -@media only screen and (max-width: 955px) { - /* Dashboard on 1 cols */ - div.box { - width: 95%; - height: 380px; - } -} -div.box table { - border-spacing: 0px; -} -div.box tr.odd { - background-color: #F2F6FD; -} -div.box tr.even { - background-color: #e4e7ed; -} -#jrn_name_div h2 { - font-size: 38.4px; - font-size: 2.4rem; -} -#search_account { - width: 70%; -} -fieldset { - border-width: 1px; -} -#tva_select table { - border-spacing: 0px; -} -#mod_predf_op { - width: 80%; - overflow: auto; - overflow-style: panner; -} -/**************************************************************************** - * Tabs - ****************************************************************************/ -ul.tabs { - padding-top: 15px; - display: block; - border-bottom: 1px solid #879ed4; - padding-left: 2px; - margin-bottom: 17px; -} -ul.tabs a { - display: inline; -} -li.tabs_selected { - display: inline; - background: #cedce7; - /* Old browsers */ - - background: -moz-linear-gradient(top, #cedce7 0%, #596a72 100%); - /* FF3.6+ */ - - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cedce7), color-stop(100%, #596a72)); - /* Chrome,Safari4+ */ - - background: -webkit-linear-gradient(top, #cedce7 0%, #596a72 100%); - /* Chrome10+,Safari5.1+ */ - - background: -o-linear-gradient(top, #cedce7 0%, #596a72 100%); - /* Opera 11.10+ */ - - background: -ms-linear-gradient(top, #cedce7 0%, #596a72 100%); - /* IE10+ */ - - background: linear-gradient(to bottom, #cedce7 0%, #596a72 100%); - /* W3C */ - - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#cedce7', endColorstr='#596a72', GradientType=0); - /* IE6-9 */ - - color: whitesmoke; - margin-left: 2px; - padding: 12px 15px 0px 15px; - vertical-align: top; - border: 1px #879ed4 solid; - font-weight: bold; -} -li.tabs { - display: inline; - background-color: inherit; - color: inherit; - margin-left: 2px; - padding: 5px 5px 0px 5px; - border: 1px grey solid; - float: left; - background-color: #f8f8ff; - margin-top: 8px; -} -li.tabs:hover { - display: inline; - background-color: grey; - color: wheat; - margin-left: 2px; - padding: 5px 5px 0px 5px; - border: 1px grey solid; -} -ul.tabs a { - text-decoration: none; - color: inherit; - display: inline; - white-space: nowrap; -} -ul.tabs a:hover { - text-decoration: none; - color: white; - display: inline; - background-color: lightblue; - white-space: nowrap; -} -@media only screen and (max-width: 1426px) { - li.tabs_selected { - padding: 8px 10px 10px 10px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - float: left; - } - li.tabs, li.tabs:hover { - padding: 10px 10px 0px 10px; - } -} -/***************************************************************************** - * Table of one column to present menu - * as in CFGLED, FORECAST, REPORT - *****************************************************************************/ -table.vert_mtitle { - text-align: center; - /* border:5px solid #99B1DF; */ - - border-radius: 5px; - width: 80%; - margin-left: 10%; - border-collapse: separate; - border-spacing: 10px; -} -table.vert_mtitle td.first { - background-color: #DCE1EF; -} -table.vert_mtitle td { - border: 1px solid #99B1DF; - background-color: #EDEDED; - border-top-radius: 20px; -} -table.vert_mtitle td a { - padding: 20px; - font-weight: bold; -} -table.vert_mtitle td:hover { - border: 1px solid #99B1DF; - background-color: #336699; - color: white; -} -table.vert_mtitle td:hover a { - color: white; -} -/******************************************************************************* - * Tiny button example : -X for remove action, remove link... - *******************************************************************************/ -div.content a.tinybutton, input[type="button"].tinybutton { - color: red; - font-weight: bold; - text-decoration: none; - font-family: arial, verdana, sans-serif, helvetica; - /* background-image: url("image/bg-submit2.gif"); - background-repeat: repeat-x; - background-position: left; */ - - font-size: 8px; - font-size: 0.7rem; - padding-bottom: 0px; - padding-top: 0px; - padding-right: 0px; - padding-left: 0px; - margin-top: 3px; - cursor: pointer; - margin: 1px 2px 1px 2px; - border-width: 1px; - border-style: solid; - border-color: orangered; - border-radius: 2px; - display: inline; -} -/*div.content td.mtitle a.mtitle { - color:darkslategrey; - // font-variant: small-caps; - background-color: inherit; -}*/ -/******************************************************************************* - Image Search -*******************************************************************************/ -.image_search { - cursor: pointer; - width: 16px; - height: 16px; - padding: 1px; - border: #000000 1px solid; - vertical-align: top; - background: grey; -} -/**************************************************************************** - * Aligned button - ****************************************************************************/ -ul.aligned-block { - padding: 5px; - display: block; -} -ul.aligned-block li { - display: table-cell; - padding: 10px; - list-style: none; -} -/****************************************************************************** - * Total in confirmation VEN / ACH - ******************************************************************************/ -#total_div_id { - float: right; - margin-right: 150px; - background: snow; - margin-top: 50px; -} -/* Selected cell in the module */ -td.toolselected { - background-color: #909BA7; -} -/*************************************************************************** - * column in the dashboard - ***************************************************************************/ -td.cut { - max-width: 25%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -td.box { - border-left: #C76626 solid 1px; -} -/**************************************************************************** -* Smoke appearance of modal box - ****************************************************************************/ -.smoke-base { - position: fixed; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - visibility: hidden; - opacity: 0; - background: rgba(0, 0, 0, 0.3); -} -.smoke-base.smoke-visible { - opacity: 1; - visibility: visible; -} -.smokebg { - position: fixed; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; -} -.smoke-base .dialog { - position: absolute; - top: 25%; - width: 40%; - left: 50%; - margin-left: -20%; -} -.dialog-prompt { - margin-top: 15px; - text-align: center; -} -.dialog-buttons { - margin: 20px 0px 5px 0px; -} -.smoke { - text-align: center; - background-color: #DCE1EF; - font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; - font-family: 'openSansRegular'; - padding: 2px; - margin: 0px; - overflow: hidden; - z-index: 3; - position: absolute; - left: 10%; - border: 1px solid #00008B; - -moz-box-shadow: 10px 10px 5px #888; - -webkit-box-shadow: 10px 10px 5px #888; - box-shadow: 10px 10px 5px #888; - font-size: 14.4px; - font-size: 0.90rem; - width: 85%; -} -.dialog-buttons button:hover { - color: beige; - font-weight: bold; -} -.dialog-buttons button { - color: #FFFFFF; - font-weight: normal; - text-decoration: none; - background: #606c88; - /* Old browsers */ - - background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); - /* FF3.6+ */ - - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #606c88), color-stop(100%, #3f4c6b)); - /* Chrome,Safari4+ */ - - background: -webkit-linear-gradient(top, #606c88 0%, #3f4c6b 100%); - /* Chrome10+,Safari5.1+ */ - - background: -o-linear-gradient(top, #606c88 0%, #3f4c6b 100%); - /* Opera 11.10+ */ - - background: -ms-linear-gradient(top, #606c88 0%, #3f4c6b 100%); - /* IE10+ */ - - background: linear-gradient(to bottom, #606c88 0%, #3f4c6b 100%); - /* W3C */ - - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#606c88', endColorstr='#3f4c6b', GradientType=0); - /* IE6-9 */ - - border-color: #605D5D; - border-width: 0px; - padding: 4px; - margin: 3px; - cursor: pointer; - margin: 1px 2px 1px 2px; - border-radius: 5px; - moz-border-radius: 5px; - width: 7em; - width: 7rem; -} -.dialog-prompt input { - margin: 0; - border: 0; - font-family: sans-serif; - outline: none; - font-family: Menlo, 'Andale Mono', monospace; - border: 1px solid #aaa; - width: 75%; - display: inline-block; - background-color: transparent; - font-size: 16px; - padding: 8px; -} -.smoke-base .dialog-inner { - padding: 15px; - color: #202020; -} -button.cancel { - background-color: rgba(0, 0, 0, 0.4); - filter: progid:dximagetransform.microsoft.gradient(startColorstr=#444444, endColorstr=#444444); -} -.queue { - display: none; -} -/* - * Menu selected when configuring the profile - */ -.field_follow_up { - margin-top: 1px; - white-space: -moz-pre-wrap; - white-space: pre-wrap; - border: 1px solid black; - width: 95%; -} -/** - * go_up -*/ -#go_up { - background-color: transparent; - border: 0px; - font-size: 350%; - box-shadow: none; - color: black; -} -#go_up a, #go_up a:visited { - background-image: none; - text-decoration: none; - color: black; -} - -/* - * Style for the Inplace Edit element - */ -span.inplace_edit -{ - text-decoration: underline; - cursor: pointer; -} -span.inplace_edit_input -{ - text-decoration: none; - font-size: 110%; - cursor: none; -} \ No newline at end of file diff --git a/html/style-print.css b/html/style-print.css index b78b23574..baca9b6e5 100644 --- a/html/style-print.css +++ b/html/style-print.css @@ -20,7 +20,7 @@ form { display:none; } -.button, .smallbutton{ +.button, .smallbutton,.icon{ display:none; } div.recherche_form { diff --git a/html/style-r692.css b/html/style-r692.css index 3128239c6..b5ea98793 100644 --- a/html/style-r692.css +++ b/html/style-r692.css @@ -16,7 +16,16 @@ .fontsforweb_fontid_38327 { font-family: 'OpenSansRegular' !important; } - +@font-face { + font-family: 'fontello'; + src: url('image/fontello/fontello.eot?18582275'); + src: url('image/fontello/fontello.eot?18582275#iefix') format('embedded-opentype'), + url('image/fontello/fontello.woff?18582275') format('woff'), + url('image/fontello/fontello.ttf?18582275') format('truetype'), + url('image/fontello/fontello.svg?18582275#fontello') format('svg'); + font-weight: normal; + font-style: normal; + } BODY { font-family: Arial, Helvetica, "Liberation Sans" , FreeSans, sans-serif; font-family: 'OpenSansRegular'; @@ -1079,39 +1088,7 @@ a.line:hover,div_content a.line background-color:#336699; cursor:pointer; } -#close_div -{ - color:white; - text-decoration:none; - margin-left: 6px; - margin-right:6px; - /*! padding-top:10px; */ - font-size:14px; - font-size:1rem; - cursor: pointer; - border:0px; - height: 18px; -} -#close_div:hover -{ - background-color: white; - color: blue; -} -#popmeout -{ - background-color:#FFFFFF; - color:#0000FF; - text-decoration:none; - border:1px solid #0000FF; - margin-left: 2px; - margin-right:18px; - font-size:12px; - font-size: 0.75rem; -} -#popmeout:hover -{ - background-color: #F93; -} + table.table_large tr.odd ,table.table_large tr.even { height:32px; @@ -2091,25 +2068,21 @@ td.selectedmenu { #go_up { background-color: transparent; border:0px; - font-size:300%; box-shadow: none; color:blue; - margin-right: 20px; } #go_up a ,#go_up a:visited{ background-image: none; text-decoration: none; color:blue; - font-size:2.7em; - font-size: 2.7rem; - /*! padding-right: 6px; */ + font-size:1.7em; + font-size: 1.7rem; padding: 0px; margin: 0px; background-color: whitesmoke; } #go_up a:hover { - background-color: gold; font-size:2.8em; font-size:2.8rem; } @@ -2219,4 +2192,36 @@ div.menu2 td.mtitle, div.menu2 td.mtitle a{ } div.menu2 td.mtitle a{ border-width:0px; +} +/** + * For the icon (font-famillo fontello) + */ +.icon { + font-family: "fontello"; + font-weight:normal; + cursor: pointer; +} +.icon:hover { + font-family: "fontello"; +} +/** + * Icon in the title of Box + */ +div.bxbutton .icon +{ + color:white; + text-decoration:none; + margin-left: 6px; + margin-right:6px; + /*! padding-top:10px; */ + font-size:14px; + font-size:1rem; + cursor: pointer; + border:0px; + height: 18px; +} +div.bxbutton .icon:hover +{ + background-color: white; + color: blue; } \ No newline at end of file diff --git a/html/user_login.php b/html/user_login.php index fab1dc0d7..2063dbe95 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -169,7 +169,7 @@ echo '';
Update(); } - $doc_mod=$hi->post('doc_mod',"number"); + $doc_mod=$http->post('doc_mod',"number"); $act->generate_document($doc_mod, $_POST); $sub_action = 'detail'; } diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php index a6b4c038d..4322b13a5 100644 --- a/include/ajax/ajax_add_concerned_card.php +++ b/include/ajax/ajax_add_concerned_card.php @@ -51,7 +51,7 @@ $r.='
'; -$r.=_('Fiche contenant').HtmlInput::infobulle(19); +$r.=_('Fiche contenant').Icon_Action::infobulle(19); $r.=$q->input(); $r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton"); $r.=''; @@ -82,6 +82,8 @@ for ($i=0; $iMAX_CARD_SEARCH)?MAX_CARD_SEARCH:count($array);

- : + :
- + Nom diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php index cbd679e7e..eae29a711 100644 --- a/include/ajax/ajax_card.php +++ b/include/ajax/ajax_card.php @@ -261,7 +261,7 @@ case 'st': } if ( strpos($where," in ()") != 0) { - $html=HtmlInput::anchor_close('select_card_div'); + $html=Icon_Action::close('select_card_div'); $html.=h2info(_('Choix de la catégorie')); $html.='

'; $html.=_("Aucune catégorie de fiche ne correspond à". @@ -384,7 +384,7 @@ case 'fs': $q=new IText('query'); $q->value=(isset($query))?$query:''; $r.=''; - $r.=_('Fiche contenant').HtmlInput::infobulle(19); + $r.=_('Fiche contenant').Icon_Action::infobulle(19); $r.=$q->input(); $r.=HtmlInput::submit('fs',_('Recherche'),"","smallbutton"); $r.=''; @@ -411,7 +411,7 @@ case 'fs': if ( strpos($sql," in ()") != 0) { - $html=HtmlInput::anchor_close('search_card'); + $html=Icon_Action::close('search_card'); $html.='
'.h2info(_('Recherche de fiche')).'
'; $html.='

'; $html.=_("Aucune catégorie de fiche ne correspond à". diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php index 3d21ff52b..199e311c1 100644 --- a/include/ajax/ajax_ledger.php +++ b/include/ajax/ajax_ledger.php @@ -207,7 +207,7 @@ case 'de': catch (Exception $e) { record_log($e->getTraceAsString()); - echo HtmlInput::anchor_close($div); + echo Icon_Action::close($div); echo '

'._("Désolé il y a une erreur").'

'; } $html=ob_get_contents(); diff --git a/include/ajax/ajax_mod_predf_op.php b/include/ajax/ajax_mod_predf_op.php index 4e11ee084..6d2bb8a2f 100644 --- a/include/ajax/ajax_mod_predf_op.php +++ b/include/ajax/ajax_mod_predf_op.php @@ -28,7 +28,7 @@ ob_start(); require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php'; $op=new Pre_Operation($cn,$_GET['id']); $array=$op->load(); -echo HtmlInput::anchor_close('mod_predf_op'); +echo Icon_Action::close('mod_predf_op'); echo h2(_('Modification du nom'),' class="title"'); echo ' diff --git a/include/ajax/ajax_navigator.php b/include/ajax/ajax_navigator.php index cdbf2aeb4..8d0892077 100644 --- a/include/ajax/ajax_navigator.php +++ b/include/ajax/ajax_navigator.php @@ -50,12 +50,12 @@ $a_menu=$cn->get_array($sql,array($_SESSION['g_user']));
Code AD - +   - + diff --git a/include/ajax/ajax_todo_list.php b/include/ajax/ajax_todo_list.php index 4736e0eef..4c95df88f 100644 --- a/include/ajax/ajax_todo_list.php +++ b/include/ajax/ajax_todo_list.php @@ -189,7 +189,7 @@ if ($ac=='shared_note') header('Content-type: text/xml; charset=UTF-8'); $dom=new DOMDocument('1.0', 'UTF-8'); $tl_id=$dom->createElement('content', _("Cette note n'est pas à vous"). - HtmlInput::anchor_close('shared_'.$id)); + Icon_Action::close('shared_'.$id)); $dom->appendChild($tl_id); echo $dom->saveXML(); return; diff --git a/include/ajax/ajax_view_action.php b/include/ajax/ajax_view_action.php index b143457a4..438d605c7 100644 --- a/include/ajax/ajax_view_action.php +++ b/include/ajax/ajax_view_action.php @@ -30,7 +30,7 @@ ob_start(); require_once NOALYSS_INCLUDE.'/class/follow_up.class.php'; require_once NOALYSS_INCLUDE.'/class/default_menu.class.php'; -echo HtmlInput::title_box(_("Détail action"), $div); +echo HtmlInput::title_box(_("Détail action"), $div,"close","","y"); $act = new Follow_Up($cn); $act->ag_id = $ag_id; $act->get(); diff --git a/include/balance.inc.php b/include/balance.inc.php index cba864e7a..dd2b0200d 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -296,7 +296,7 @@ if ( isset($_GET['view'] ) ) $b=$periode->get_date_limit($_GET['to_periode']); echo "

période du ".$a['p_start']." au ".$b['p_end']."

"; echo ''; - echo _('Cherche').HtmlInput::infobulle(24); + echo _('Cherche').Icon_Action::infobulle(24); echo HtmlInput::filter_table("t_balance", "0,1","1"); echo ''; echo ''; diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index 93c3140c5..2e10a2d41 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -1202,7 +1202,7 @@ class Acc_Ledger extends jrn_def_sql if ($wLedger==null) throw new Exception(_('Pas de journal disponible')); $wLedger->javascript="onChange='update_name();update_predef(\"ods\",\"t\",\"".$_REQUEST['ac']."\");$add_js'"; - $label=" Journal ".HtmlInput::infobulle(2); + $label=" Journal ".Icon_Action::infobulle(2); $ret.="
"; $ret.=tr(td($label).td($wLedger->input())); @@ -1263,7 +1263,7 @@ class Acc_Ledger extends jrn_def_sql exit(); } } - $label=HtmlInput::infobulle(3); + $label=Icon_Action::infobulle(3); $f_periode=td(_("Période comptable")." $label ").td($l_form_per); $ret.=tr($f_periode); } @@ -1303,8 +1303,8 @@ class Acc_Ledger extends jrn_def_sql $ret.=HtmlInput::hidden('nb_item', $nb_row); $ret.=dossier::hidden(); $ret.=HtmlInput::hidden('jrn_type', $this->get_type()); - $info=HtmlInput::infobulle(0); - $info_poste=HtmlInput::infobulle(9); + $info=Icon_Action::infobulle(0); + $info_poste=Icon_Action::infobulle(9); $ret.='
'; $ret.=''. ''. @@ -3234,9 +3234,7 @@ class Acc_Ledger extends jrn_def_sql function add_card($p_filter, $p_id_update) { $js_script="this.filter='{$p_filter}';this.elementId='{$p_id_update}';this.jrn=\$('p_jrn').value; select_card_type(this);"; - $str_add_button=HtmlInput::button_image($js_script, uniqid(), - 'class="smallbutton image_search"', - "image/bouton-plus.png"); + $str_add_button=Icon_Action::icon_add(uniqid(), $js_script); return $str_add_button; } /** diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php index f84d90417..2144b1f71 100644 --- a/include/class/acc_ledger_fin.class.php +++ b/include/class/acc_ledger_fin.class.php @@ -295,7 +295,7 @@ class Acc_Ledger_Fin extends Acc_Ledger } } - $label = HtmlInput::infobulle(3); + $label = Icon_Action::infobulle(3); $f_period = "Période comptable $label" . $l_form_per; } @@ -315,7 +315,7 @@ class Acc_Ledger_Fin extends Acc_Ledger $wLedger->javascript = $add_js; - $label = " Journal " . HtmlInput::infobulle(2); + $label = " Journal " . Icon_Action::infobulle(2); $f_jrn = $label . $wLedger->input(); @@ -345,7 +345,7 @@ class Acc_Ledger_Fin extends Acc_Ledger $wPJ->value = (isset($e_pj)) ? $e_pj : $default_pj; $f_extrait = $wPJ->input() . HtmlInput::hidden('e_pj_suggest', $default_pj); - $label = HtmlInput::infobulle(7); + $label = Icon_Action::infobulle(7); $first_sold = (isset($first_sold)) ? $first_sold : ""; $wFirst = new INum('first_sold', $first_sold); @@ -383,7 +383,6 @@ class Acc_Ledger_Fin extends Acc_Ledger $W1->value = $tiers; $W1->extra = 'deb'; // credits $W1->typecard = 'deb'; - $W1->style=' style = "vertical-align:65%"'; $W1->set_dblclick("fill_ipopcard(this);"); $W1->set_attribute('ipopup', 'ipopcard'); diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php index 1f3696a3c..c931a09da 100644 --- a/include/class/acc_ledger_purchase.class.php +++ b/include/class/acc_ledger_purchase.class.php @@ -1005,7 +1005,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $Echeance=new IDate(); $Echeance->setReadOnly(false); $Echeance->tabindex=2; - $label=HtmlInput::infobulle(4); + $label=Icon_Action::infobulle(4); $f_echeance=$Echeance->input('e_ech',$e_ech,'Echéance'.$label); $f_periode=""; if ($this->check_periode() == true) @@ -1034,7 +1034,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger } $r.="'; } /* if we suggest the next pj, then we need a javascript */ @@ -1110,7 +1110,7 @@ EOF; throw new Exception(_('Pas de journal disponible')); $wLedger->table = 1; $wLedger->javascript = "onChange='update_predef(\"ven\",\"f\",\"".$_REQUEST['ac']."\");$add_js'"; - $wLedger->label = " Journal " . HtmlInput::infobulle(2); + $wLedger->label = " Journal " . Icon_Action::infobulle(2); $f_jrn = $wLedger->input(); @@ -1120,7 +1120,7 @@ EOF; $Commentaire->size = 60; $Commentaire->tabindex = 3; - $label = HtmlInput::infobulle(1); + $label = Icon_Action::infobulle(1); $f_desc = $Commentaire->input("e_comm", $e_comm) ; // PJ @@ -1159,7 +1159,7 @@ EOF; } $W1 = new ICard(); - $W1->label = "Client " . HtmlInput::infobulle(0); + $W1->label = "Client " . Icon_Action::infobulle(0); $W1->name = "e_client"; $W1->tabindex = 3; $W1->value = $e_client; @@ -1178,7 +1178,6 @@ EOF; $W1->javascript = sprintf(' onchange="fill_data_onchange(\'%s\');" ', $W1->name); $f_client_qcode = $W1->input(); $client_label = new ISpan(); - $client_label->style="vertical-align:top"; $client_label->table = 0; $f_client = $client_label->input("e_client_label", $e_client_label); $f_client_bt = $W1->search(); diff --git a/include/class/anc_print.class.php b/include/class/anc_print.class.php index dca5180a1..78d0866a0 100644 --- a/include/class/anc_print.class.php +++ b/include/class/anc_print.class.php @@ -140,7 +140,7 @@ class Anc_Print
Quickcode'.$info.'"; - $label=HtmlInput::infobulle(3); + $label=Icon_Action::infobulle(3); $f_periode=td(_("Période comptable")." $label ").td($l_form_per); } // Ledger (p_jrn) @@ -1067,7 +1067,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $Commentaire->setReadOnly(false); $Commentaire->size=60; $Commentaire->tabindex=3; - $label=HtmlInput::infobulle(1) ; + $label=Icon_Action::infobulle(1) ; $f_desc=$Commentaire->input("e_comm",$e_comm); // PJ @@ -1116,7 +1116,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger } $W1=new ICard(); - $W1->label=_("Fournisseur ").HtmlInput::infobulle(0) ; + $W1->label=_("Fournisseur ").Icon_Action::infobulle(0) ; $W1->name="e_client"; $W1->tabindex=3; $W1->value=$e_client; @@ -1530,7 +1530,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger { $r.=''; - $r.=HtmlInput::infobulle(28); + $r.=Icon_Action::infobulle(28); $r.='' .nbm($tva_item).''; } diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php index 40c3ae7cf..4c24a77fb 100644 --- a/include/class/acc_ledger_search.class.php +++ b/include/class/acc_ledger_search.class.php @@ -215,7 +215,7 @@ class Acc_Ledger_Search $f_accounting->set_attribute('ipopup', 'ipop_account'); $f_accounting->set_attribute('label', 'ld'); $f_accounting->set_attribute('account', $this->div.'accounting'); - $info=HtmlInput::infobulle(13); + $info=Icon_Action::infobulle(13); $f_paid=new ICheckbox('unpaid', null, $this->div.'unpaid'); $f_paid->selected=(isset($_REQUEST['unpaid']))?true:false; @@ -556,7 +556,7 @@ class Acc_Ledger_Search { $r=''; $r.=''; - $r.=HtmlInput::infobulle(28); + $r.=Icon_Action::infobulle(28); $r.='' . nbm($tva_item) . ''; } else { @@ -1064,7 +1064,7 @@ EOF; $Echeance->setReadOnly(false); $Echeance->tabindex = 2; - $label = HtmlInput::infobulle(4); + $label = Icon_Action::infobulle(4); $f_echeance = $Echeance->input('e_ech', $e_ech, _('Echéance') . $label); $Date = new IDate(); $Date->setReadOnly(false); @@ -1090,7 +1090,7 @@ EOF; throw new Exception( _("Aucune période ouverte") ); } } - $label = HtmlInput::infobulle(3); + $label = Icon_Action::infobulle(3); $f_periode = '' . _("Période comptable") . " $label " . $l_form_per . ' @@ -153,7 +153,7 @@ class Anc_Print @@ -166,7 +166,7 @@ class Anc_Print
input(); - echo HtmlInput::infobulle(42); + echo Icon_Action::infobulle(42); ?> diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index b1c3122a7..86c525375 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -499,7 +499,7 @@ class Fiche $w->set_attribute('ipopup', 'ipop_account'); $w->set_attribute('account', "av_text" . $attr->ad_id); $w->table = 1; - $bulle = HtmlInput::infobulle(14); + $bulle = Icon_Action::infobulle(14); break; case 'select': $w = new ISelect("av_text" . $attr->ad_id); @@ -528,7 +528,7 @@ class Fiche $w->name = "av_text" . $attr->ad_id; if ($attr->ad_id == 21 || $attr->ad_id==22||$attr->ad_id==20||$attr->ad_id==31) { - $bulle=HtmlInput::infobulle(21); + $bulle=Icon_Action::infobulle(21); } if ($attr->ad_id == ATTR_DEF_NAME || $attr->ad_id== ATTR_DEF_QUICKCODE) $class=" input_text highlight info"; @@ -597,10 +597,10 @@ class Fiche $sql="select account_auto($this->fiche_def)"; $ret_sql=$this->cn->exec_sql($sql); $a=Database::fetch_array($ret_sql, 0); - $bulle=HtmlInput::infobulle(10); + $bulle=Icon_Action::infobulle(10); if ($a['account_auto']=='t') - $bulle.=HtmlInput::warnbulle(11); + $bulle.=" ".Icon_Action::warnbulle(11); } elseif ($r->ad_id==ATTR_DEF_TVA) { @@ -639,7 +639,7 @@ class Fiche $w->dbl_click_history(); $w->width=$r->ad_size; $w->table=0; - $bulle=HtmlInput::infobulle(14); + $bulle=Icon_Action::infobulle(14); $w->value=$r->av_text; break; case 'card': @@ -711,7 +711,7 @@ class Fiche if ($r->ad_id==21||$r->ad_id==22||$r->ad_id==20||$r->ad_id==31) { - $bulle=HtmlInput::infobulle(21); + $bulle=Icon_Action::infobulle(21); } if ($r->ad_id == ATTR_DEF_NAME || $r->ad_id== ATTR_DEF_QUICKCODE||$r->ad_id==ATTR_DEF_ACCOUNT) $class=" input_text highlight info"; @@ -1755,7 +1755,7 @@ class Fiche $r.=' - '. + '. ''. ' diff --git a/include/class/periode.class.php b/include/class/periode.class.php index 982aa90cc..1b6b45e4a 100644 --- a/include/class/periode.class.php +++ b/include/class/periode.class.php @@ -615,12 +615,12 @@ class Periode if ($obj->getp("p_closed")=='f') { $javascript=sprintf('%s.close_periode(\'%d\')', $p_js, $obj->p_id); - echo HtmlInput::image_click(ICONON, $javascript, _('Fermé')); + echo Icon_Action::iconon(uniqid(), $javascript); } else { $javascript=sprintf("%s.open_periode('%d')", $p_js, $obj->p_id); - echo HtmlInput::image_click(ICONOFF, $javascript, _('Ouvert')); + echo Icon_Action::iconoff(uniqid(),$javascript ); } echo ""; echo ""; diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php index 5a5544a5d..00fbad9b0 100644 --- a/include/class/pre_op_ach.class.php +++ b/include/class/pre_op_ach.class.php @@ -228,7 +228,7 @@ class Pre_op_ach extends Pre_operation_detail } $W1=new ICard(); - $W1->label=_("Fournisseur ").HtmlInput::infobulle(0) ; + $W1->label=_("Fournisseur ").Icon_Action::infobulle(0) ; $W1->name="e_client"; $W1->tabindex=3; $W1->value=$e_client; diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php index f8d6efcec..e743e0dad 100644 --- a/include/class/pre_op_advanced.class.php +++ b/include/class/pre_op_advanced.class.php @@ -186,8 +186,8 @@ class Pre_Op_Advanced extends Pre_operation_detail $ret.=dossier::hidden(); $ret.=HtmlInput::hidden('jrn_type', $legder->get_type()); - $info = HtmlInput::infobulle(0); - $info_poste = HtmlInput::infobulle(9); + $info = Icon_Action::infobulle(0); + $info_poste = Icon_Action::infobulle(9); if ($g_user->check_action(FICADD) == 1) $ret.=$f_add_button->input(); $ret.='
'._('Quick Code').HtmlInput::infobulle(17).''._('Quick Code').Icon_Action::infobulle(17).''._('Poste comptable').''._('Nom').''.' '._('Adresse').'
'; diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php index 3a81daed2..be479d5f3 100644 --- a/include/class/pre_op_ven.class.php +++ b/include/class/pre_op_ven.class.php @@ -229,7 +229,7 @@ class Pre_op_ven extends Pre_operation_detail } $W1=new ICard(); - $W1->label="Client ".HtmlInput::infobulle(0) ; + $W1->label="Client ".Icon_Action::infobulle(0) ; $W1->name="e_client"; $W1->tabindex=3; $W1->value=$e_client; diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php index 11391f292..fa79dfe3b 100644 --- a/include/compta_fin_rec.inc.php +++ b/include/compta_fin_rec.inc.php @@ -223,7 +223,7 @@ $select_all->javascript="recompute('rec1')"; echo $select_all->input(); echo '

'; echo '

'; -echo _('Cherche').HtmlInput::infobulle(25); +echo _('Cherche').Icon_Action::infobulle(25); echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1"); echo '

'; echo HtmlInput::submit('save', 'Mettre à jour le n° de relevé bancaire'); @@ -233,7 +233,7 @@ echo ''; echo ''; echo '
'; -$r =''; +$r =''; $r.=th('Libellé'); $r.=th('N° interne'); $r.=th('Montant', ' style="text-align:right"'); diff --git a/include/compta_fin_saldo.inc.php b/include/compta_fin_saldo.inc.php index b7dcfa7b4..c56e56759 100644 --- a/include/compta_fin_saldo.inc.php +++ b/include/compta_fin_saldo.inc.php @@ -44,7 +44,7 @@ echo h1(_("Exercice")." ".$exercice); echo _('Cherche').' : '.HtmlInput::filter_table("fin_saldo_tb", '0,1,2,3', '1'); echo '
'.'Date '.HtmlInput::infobulle(17).''.''.'Date '.Icon_Action::infobulle(17).''.'
'; echo tr(th('Quick Code', ' class=" sorttable_sorted"', - HtmlInput::infobulle(17).'') + Icon_Action::infobulle(17).'') .th(_('Compte en banque'), ' style="text-align:left"') .th(_('Journal'), ' style="text-align:center"') .th(_('Description'), ' style="text-align:center"') diff --git a/include/constant.php b/include/constant.php index 73eaab295..86229d1ab 100644 --- a/include/constant.php +++ b/include/constant.php @@ -311,5 +311,6 @@ define ('EXC_PARAM_TYPE',1006); define ('EXC_DUPLICATE',1200); define ('ICONON','icon-on.png'); define ('ICONOFF','icon-off.png'); -define ("PINDG","⊕"); -define ("UNPINDG","≊"); \ No newline at end of file +define ("PINDG",""); +define ("UNPINDG",""); +//define ("UNPINDG","≊"); \ No newline at end of file diff --git a/include/dossier.inc.php b/include/dossier.inc.php index aee188241..18f1257d0 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -236,7 +236,7 @@ if ( $sa == 'list' ) $template=""; echo '
'; echo ''; - echo _('Cherche').HtmlInput::infobulle(23); + echo _('Cherche').Icon_Action::infobulle(23); echo HtmlInput::filter_table("t_dossier", "0,1,2","1"); echo ''; echo '
'; diff --git a/include/fiche.inc.php b/include/fiche.inc.php index e4c6d72cd..66e8a3f1c 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -89,7 +89,7 @@ $search_card_js=sprintf('onclick="boxsearch_card(\'%d\')"',dossier::id()); ?>
- :input()?> + :input()?>
Poste'.HtmlInput::infobulle(27).''. + ''. th('Débit', 'style="text-align:right"') . th('Crédit', 'style="text-align:right"') . th('Solde', 'style="text-align:right"') . @@ -509,7 +509,7 @@ for ($e = 0; $e < count($afiche); $e++) echo '

' . $detail_card ; echo "poste " - . ":".HtmlInput::history_account($row->strAttribut(ATTR_DEF_ACCOUNT),$row->strAttribut(ATTR_DEF_ACCOUNT),'display:inline').HtmlInput::infobulle(27).'

'; + . ":".HtmlInput::history_account($row->strAttribut(ATTR_DEF_ACCOUNT),$row->strAttribut(ATTR_DEF_ACCOUNT),'display:inline').Icon_Action::infobulle(27).''; echo '
Poste'.Icon_Action::infobulle(27).'
'; echo ''; diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index d8bc42d96..c9589a3c3 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -35,7 +35,7 @@ global $g_user,$http; //----------------------------------------------------- require_once NOALYSS_INCLUDE.'/lib/database.class.php'; -if ($g_user->Admin() == 0 && $g_user->is_local_admin() == 0) +if ($g_user->Admin() == 0 && $g_user->is_local_admin() == 0 && $g_user->get_status_security_ledger()==1) { $sql = "select jrn_def_id,jrn_def_name from jrn_def join jrn_type on jrn_def_type=jrn_type_id @@ -53,16 +53,16 @@ else from jrn_def join jrn_type on jrn_def_type=jrn_type_id order by jrn_def_name "); + // Count the forbidden journaux +// $NoPriv = $cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv, +// jrn_deb_max_line,jrn_cred_max_line +// from jrn_def join jrn_type on jrn_def_type=jrn_type_id +// join user_sec_jrn on uj_jrn_id=jrn_def_id +// where +// uj_login=$1 +// and uj_priv ='X' +// ",array($g_user->id)); } -// Count the forbidden journaux -$NoPriv = $cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv, - jrn_deb_max_line,jrn_cred_max_line - from jrn_def join jrn_type on jrn_def_type=jrn_type_id - join user_sec_jrn on uj_jrn_id=jrn_def_id - where - uj_login=$1 - and uj_priv ='X' - ",array($g_user->id)); /* * Show all the available ledgers */ @@ -139,7 +139,7 @@ $w->selected = 1; print ''; print ''; $w->selected = (isset($simple)) ? $simple : '1'; -echo '' . $w->input('p_simple', $a); +echo '' . $w->input('p_simple', $a); print ""; echo '
Style d\'impression '.HtmlInput::infobulle(32).'Style d\'impression '.Icon_Action::infobulle(32).'
'; diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index 7c0d5f547..6a910e4ef 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -831,7 +831,7 @@ function ajax_disconnected($div) $script.='a.style.top=posY-20+offsetY;a.style.left=posX+offsetX;'; $script = create_script($script); $html = $script; - $html.=HtmlInput::anchor_close($div); + $html.=Icon_Action::close($div); $html.='
'; $html.=h2(_('Données non disponibles'), 'class="title" style="width:auto"'); $html.=h2(_('Veuillez vous reconnecter soit dans une autre fenêtre soit ' @@ -1176,7 +1176,7 @@ function display_dashboard_operation($p_array,$p_title,$p_div) ?>