[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 04/04: Cosmetique ======== remplacement des
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 04/04: Cosmetique ======== remplacement des div "fermer" et pop me out Changement des focus (css) Amélioration visuelle pour la sélection de la TVA + filtre |
|
Date: |
Wed, 20 May 2015 22:38:36 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 1745e06ee72fea0fbb48f64952acf8b1c647ab1a
Author: Dany De Bontridder <address@hidden>
Date: Thu May 21 00:35:00 2015 +0200
Cosmetique
========
remplacement des div "fermer" et pop me out
Changement des focus (css)
Amélioration visuelle pour la sélection de la TVA + filtre
---
html/ajax_card.php | 8 ++++----
html/ajax_ledger.php | 1 -
html/ajax_misc.php | 8 ++++----
html/js/scripts.js | 2 +-
html/recherche.php | 4 ++--
html/style-classic.css | 27 +++++++++++----------------
include/ajax_mod_periode.php | 6 +++---
include/class_acc_ledger.php | 3 +--
include/class_html_input.php | 6 +++---
include/template/ledger_detail_top.php | 6 +++---
10 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/html/ajax_card.php b/html/ajax_card.php
index 0c03f86..dc42dc4 100644
--- a/html/ajax_card.php
+++ b/html/ajax_card.php
@@ -177,7 +177,7 @@ case 'dc':
{
$html.=HtmlInput::submit('save',_('Sauver'));
}
-
$html.=HtmlInput::button('close_'.$ctl,'Fermer',"onclick=\"removeDiv('$ctl')\"");
+
$html.=HtmlInput::button('close_'.$ctl,'⨉',"onclick=\"removeDiv('$ctl')\"");
if ( ! isset
($nohistory))$html.=HtmlInput::history_card_button($f->id,_('Historique'));
if ($can_modify==1)
{
@@ -188,7 +188,7 @@ case 'dc':
else
{
$html.='<h2 class="error">'._('Aucune fiche demandée').'</h2>';
-
$html.=HtmlInput::button('close_'.$ctl,_('Fermer'),"onclick=\"removeDiv('$ctl')\"");
+
$html.=HtmlInput::button('close_'.$ctl,_('⨉'),"onclick=\"removeDiv('$ctl')\"");
}
break;
/* ------------------------------------------------------------ */
@@ -347,7 +347,7 @@ case 'sc':
{
$html.=alert(_('Action interdite'),true);
}
- $html.=HtmlInput::button('fermer',_('Fermer'),"
onclick=\"removeDiv('$ctl')\";");
+ $html.=HtmlInput::button('fermer',_('⨉'),"
onclick=\"removeDiv('$ctl')\";");
break;
/*----------------------------------------------------------------------
* Search a card
@@ -560,7 +560,7 @@ case 'upc':
$html.=ob_get_contents();
ob_end_clean();
$html.=$f->Display(true);
-
$html.=HtmlInput::button('close_'.$ctl,'Fermer',"onclick=\"removeDiv('$ctl')\"");
+
$html.=HtmlInput::button('close_'.$ctl,'⨉',"onclick=\"removeDiv('$ctl')\"");
}
}
} // switch
diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php
index 8468a5f..e44d94f 100644
--- a/html/ajax_ledger.php
+++ b/html/ajax_ledger.php
@@ -245,7 +245,6 @@ case 'file':
echo "<div>";
}
- echo "<h1 class=\"legend\">Document</h1>";
if ( $access=='W')
{
echo '<FORM METHOD="POST" ENCTYPE="multipart/form-data"
id="form_file">';
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index b6eb0ea..bde0db1 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -211,8 +211,8 @@ EOF;
$r = HtmlInput::anchor_close('tva_select');
$r.=h2(_('Choisissez la TVA '),'class="title"');
$r.='<div >';
- $r.= '<TABLE style="width:100%">';
- $r.=th('');
+ $r.=_('Filter')."
".HtmlInput::filter_table("tva_select_table",'0,1,2,3' , 1);
+ $r.= '<TABLE style="width:100%" id="tva_select_table">';
$r.=th(_('code'));
$r.=th(_('Taux'));
$r.=th(_('Symbole'));
@@ -245,8 +245,7 @@ EOF;
}
$set = '<INPUT TYPE="BUTTON" class="button"
Value="select" ' . $script . '>';
$class=($i%2 == 0)?' class="odd" ':' class="even" ';
- $r.='<tr'.$class. '>';
- $r.=td($set);
+ $r.='<tr'.$class. $script.' style="cursor : pointer">';
$r.=td($row['tva_id']);
$r.=td($row['tva_rate']);
$r.=td($row['tva_label']);
@@ -255,6 +254,7 @@ EOF;
}
$r.='</TABLE>';
$r.='</div>';
+
$html = escape_xml($r);
header('Content-type: text/xml; charset=UTF-8');
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 80c6ae5..ecb9cbc 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -510,7 +510,7 @@ function popup_select_tva(obj)
var popup = {'id': 'tva_select', 'cssclass':
'inner_box', 'style': str_style, 'html': code_html, 'drag': true};
add_div(popup);
-
+ $('lk_tva_select_table').focus();
}
catch (e)
{
diff --git a/html/recherche.php b/html/recherche.php
index 3941adc..3590dda 100644
--- a/html/recherche.php
+++ b/html/recherche.php
@@ -64,7 +64,7 @@ echo '<form method="GET">';
echo $search_box;
echo HtmlInput::submit("viewsearch",_("Recherche"));
?>
-<input type="button" class="button" onclick="window.close()" value="<?php echo
_('Fermer')?>">
+<input type="button" class="button" onclick="window.close()" value="⨉">
<?php
echo '</form>';
@@ -108,7 +108,7 @@ if ( isset ($_GET['viewsearch']))
echo HtmlInput::submit('viewsearch','Export vers CSV');
echo HtmlInput::hidden('p_action','ALL');
?>
- <input type="button" class="button" onclick="window.close()" value="<?php
echo _('Fermer')?>">
+ <input type="button" class="button" onclick="window.close()"
value="⨉">
<?php
echo '</form>';
diff --git a/html/style-classic.css b/html/style-classic.css
index 8cb965a..52bfcc8 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -19,7 +19,7 @@ BODY {
margin:0px;
color:#0000FF;
font-size:0.9em;
- font-size:0.75rem;
+ font-size:0.95rem;
}
.notice {
color:#FF0000;
@@ -576,15 +576,11 @@ div.content input.text {
-div.redcontent input:focus {
+div.redcontent input:focus , *.input_text:focus, div.content input:focus,
div.redcontent textarea:focus
+{
background-color:#F93;
}
-div.content input:focus {
- background-color: #F93;
-}
-div.redcontent textarea:focus {
- background-color: #F93;
-}
+
.document {
color: #202267;
border-collapse:collapse;
@@ -1038,6 +1034,8 @@ div.inner_box {
@media only screen and (min-width: 1281px) {
div.inner_box {
width: 85%;
+ border-radius: 9px;
+ padding: 5px;
}
}
div.op_detail_title {
@@ -1218,16 +1216,15 @@ a.line:hover,div_content a.line
}
#close_div
{
- background-color:#FFFFFF;
- color:#0000FF;
+ color:white;
text-decoration:none;
- border:1px solid #0000FF;
margin-left: 2px;
margin-right:2px;
margin-top:0px;
- font-size:12px;
- font-size:0.75rem;
+ font-size:14px;
+ font-size:1rem;
cursor: pointer;
+ border:0px;
}
#close_div:hover
{
@@ -1329,7 +1326,7 @@ h2.title {
background-color:#606c88;
color:#FFFFFF;
text-align:center;
- padding:0.24%;
+ padding:0.14%;
border:1px solid #00008B;
background: #606c88 !important; /* Old browsers */
background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+
*/
@@ -1338,8 +1335,6 @@ h2.title {
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 */
-
-
}
h3.title {
color: #0000FF;
diff --git a/include/ajax_mod_periode.php b/include/ajax_mod_periode.php
index a069d83..58a6e2c 100644
--- a/include/ajax_mod_periode.php
+++ b/include/ajax_mod_periode.php
@@ -57,7 +57,7 @@ switch ($op)
$html.=tr(td(_(' Exercice : ')) . td($p_exercice->input()));
$html.='</table>';
$html.=HtmlInput::submit('sauver', _('sauver'));
- $html.=HtmlInput::button('close', _('Fermer'),
'onclick="removeDiv(\'mod_periode\')"');
+ $html.=HtmlInput::button('close', "⨉",
'onclick="removeDiv(\'mod_periode\')"');
$html.=HtmlInput::hidden('p_id', $_GET['p_id']);
$html.='</form>';
break;
@@ -75,7 +75,7 @@ switch ($op)
$html.='<h2 class="info">'._('Modifier les dates de début et fin
de période').'</h2>';
$html.="<div class=\"error\">"._('Erreur date invalide')."</div>";
- $html.=HtmlInput::button('close', _('Fermer'),
'onclick="removeDiv(\'mod_periode\')"');
+ $html.=HtmlInput::button('close', '⨉',
'onclick="removeDiv(\'mod_periode\')"');
}
else
{
@@ -86,7 +86,7 @@ switch ($op)
$html = '<h2 class="info"> Modifier les dates de début et fin
de période</h2>';
$html.='<h2 class="notice"> Sauvé </h2>';
- $html.=HtmlInput::button('close', _('Fermer'), 'onclick="
refresh_window();"');
+ $html.=HtmlInput::button('close', "⨉", 'onclick="
refresh_window();"');
}
catch (Exception $e)
{
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index a137dc6..317a674 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -2940,7 +2940,7 @@ class Acc_Ledger extends jrn_def_sql
if ($type == "")
$type = 'ALL';
$r.='<div id="search_form" style="display:none">';
- $r.=HtmlInput::anchor_hide('Fermer',
'$(\'search_form\').style.display=\'none\';');
+ $r.=HtmlInput::anchor_hide('⨉',
'$(\'search_form\').style.display=\'none\';');
$r.=h2('Recherche','class="title"');
$r.='<FORM METHOD="GET">';
$r.=$this->search_form($type);
@@ -2956,7 +2956,6 @@ class Acc_Ledger extends jrn_def_sql
$r.= HtmlInput::hidden("sc", $_REQUEST['sc']);
if (isset($_REQUEST['f_id']))
$r.=HtmlInput::hidden("f_id", $_REQUEST['f_id']);
- $r.=HtmlInput::button_anchor(_('Fermer'), 'javascript:void(0)',
'fsearch_form',
'onclick="$(\'search_form\').style.display=\'none\';"','smallbutton');
$r.='</FORM>';
diff --git a/include/class_html_input.php b/include/class_html_input.php
index 1c3206e..720b2d5 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -412,7 +412,7 @@ class HtmlInput
*/
static function button_close($div_name)
{
- $a=new IButton('Fermer',_('Fermer'));
+ $a=new IButton('Fermer');
$a->label=_("Fermer");
$a->javascript="removeDiv('".$div_name."')";
$html=$a->input();
@@ -428,7 +428,7 @@ class HtmlInput
{
$r='';
$r.='<div style="position:absolute;right:2px;margin:2px;padding:0px;">';
- $r.= '<A id="close_div" class="input_text"
onclick="removeDiv(\''.$div.'\');">'._('Fermer').'</A>';
+ $r.= '<A id="close_div" class="input_text"
onclick="removeDiv(\''.$div.'\');">⨉</A>';
$r.='</div>';
return $r;
}
@@ -712,7 +712,7 @@ class HtmlInput
static function title_box($name,$div,$mod="close",$p_js="")
{
if ($mod=='close')
$r=HtmlInput::anchor_close($div);
- if ($mod=='hide')
$r=HtmlInput::anchor_hide(_('Fermer'),"$('$div').hide();$p_js");
+ if ($mod=='hide')
$r=HtmlInput::anchor_hide("⨉","$('$div').hide();$p_js");
if ( $mod == 'none') $r="";
$r.=h2($name,' class="title" ');
return $r;
diff --git a/include/template/ledger_detail_top.php
b/include/template/ledger_detail_top.php
index b817f24..7cf6be5 100644
--- a/include/template/ledger_detail_top.php
+++ b/include/template/ledger_detail_top.php
@@ -9,9 +9,9 @@
$msg_close=_('Fermer');
$msg_pop=_('Ouvrir dans une fenêtre séparée');
- echo '<A id="close_div" title="'.$msg_pop.'" onclick="var
a=window.open(\'popup.php?'.$str.'\',\'\',\'location=no,toolbar=no,fullscreen=yes,scrollbars=yes,resizable=yes,status=no\');
a.focus();removeDiv(\''.$div.'\')">
-!pop me out ! </A>';
- echo '<A id="close_div" title="'.$msg_close.'"
onclick="removeDiv(\''.$div.'\');">'._("Fermer").'</A>';
+ echo '<A id="close_div" title="'.$msg_pop.'" onclick="var
a=window.open(\'popup.php?'.$str.'\',\'\',\'location=no,toolbar=no,fullscreen=yes,scrollbars=yes,resizable=yes,status=no\');
a.focus();removeDiv(\''.$div.'\')">⬜
+</A>';
+ echo '<A id="close_div" title="'.$msg_close.'"
onclick="removeDiv(\''.$div.'\');">⨉</A>';
}
?>
</div>