[Noalyss-commit] [noalyss] 03/15: Cosmetic

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 5459b10fbe3e84712f7fd7f631879d9b87bf872c
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Tue Jan 26 12:33:55 2021 +0100

    Cosmetic
---
 html/ajax_misc.php            |  2 +-
 html/js/infobulle.js          |  6 +++++-
 html/style-classic7.css       | 15 +++++++++------
 include/ajax/ajax_card.php    |  8 ++++----
 include/class/fiche.class.php |  2 +-
 include/template/menu.php     |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index f0cd815..1286976 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -552,7 +552,7 @@ EOF;
                 echo '<div>';
                 echo '<h1 >'.$ajrn[0]['jrn_def_name'].'</h1>';
                 if ( trim($ajrn[0]['jrn_def_description']) != "") {
-                    echo '<p style="border:1px 
solid;margin-top:0px">'.$ajrn[0]['jrn_def_description'].'</p>';
+                    echo '<p style="border:1px 
solid;margin-top:0px;padding:1rem">'.$ajrn[0]['jrn_def_description'].'</p>';
                 }
                 echo '</div>';
             }
diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index f283d5c..bc5aa59 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -92,7 +92,11 @@ function displaySelectBox(p_name) {
         }
         newDiv.innerHTML=$("select_box"+p_name).innerHTML;
         var viewport = document.viewport.getDimensions();
-        newDiv.style.top=posY+"px";
+        var locPosY=posY;
+        if ( posY+offsetY+ newDiv.getHeight() > window.innerHeight -3) {
+        locPosY-=newDiv.getHeight()+20
+        }
+        newDiv.style.top=locPosY+"px";
 
         
newDiv.style.left=document.getElementById(p_name+"_bt").offsetLeft+"px";
         newDiv.setStyle({display:"block",position:"absolute","z-index":999});
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 4baeb9e..3312064 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -353,7 +353,8 @@ td.selectedcell{
     }
 }
 .menu2 td.mtitle ,.menu2 td.selectedcell{
-    border-radius: 0px;
+    /*! border-radius: 0px; */
+    border-radius: 4px;
 }
 
 @media only screen and (max-width:955px) {
@@ -1219,7 +1220,7 @@ div.foldercontent {
     font-size:0.95rem;
     width: 95%;
     margin-left: 2.5%;
-    margin-top:7%;
+    margin-top:5rem;
 }
 
 h1.title {
@@ -1296,7 +1297,7 @@ div.menu2 a.mtitle{
     /*color: darkblue;*/
     padding:5px 0px;
     margin:0px;
-    border-radius: 5px;
+    /*! border-radius: 5px; */
     }
 div.menu2 a.mtitle:hover,div.menu a.mtitle:hover,td.mtitle a.mtitle:hover {
     /* color:#5681B7;
@@ -1308,7 +1309,7 @@ div.menu2 a.mtitle:hover,div.menu 
a.mtitle:hover,td.mtitle a.mtitle:hover {
     
 }
 div.menu2 a.mtitle:hover {
-    border-radius: 0px 0px;
+    /*! border-radius: 0px 0px; */
     /*! padding: 5px; */
 }
 div.menu2 table {
@@ -1540,7 +1541,8 @@ td.workday ol {
 input.inum {
     text-align:right;
     border:1px solid #0000FF;
-    margin:2px
+    margin:2px;
+    border-radius: 2px;
 }
 div.box  {
     background-color:#e4e7ed;
@@ -2264,8 +2266,9 @@ div.menu2 td.mtitle, div.menu2 td.mtitle a{
     border-style: solid;
     border-width: 0.1px;
     border-color:white;
-    height:25px;
+    height:40px;
     border-radius: 4px 4px 4px 4px;
+    /*! padding: 5px; */
 }
 div.menu2 td.mtitle a{
     border-width:0px;
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index ce42ebc..9db37ba 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -195,11 +195,11 @@ case 'dc':
 case 'bc':
     if ( $g_user->check_action(FICADD)==1 || $g_user->check_action(FIC)==1)
     {
-        $r=HtmlInput::title_box(_("Nouvelle fiche"), $ctl);
-       /* get cat. name */
-       $cat_name=$cn->get_value('select fd_label from fiche_def where 
fd_id=$1',
+           /* get cat. name */
+           $cat_name=$cn->get_value('select fd_label from fiche_def where 
fd_id=$1',
                                 array($fd_id));
-        $f=new Fiche($cn);
+        $r=HtmlInput::title_box($cat_name, $ctl);
+               $f=new Fiche($cn);
         $r.='<form id="save_card" method="POST" 
onsubmit="this.ipopup=\''.$ctl.'\';save_card(this);return false;" >';
         $r.=dossier::hidden();
         $r.=(isset($ref))?HtmlInput::hidden('ref',1):'';
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 579e5fa..12f7828 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -475,7 +475,7 @@ class Fiche
         $f=new Fiche_Def($this->cn,$p_fiche_def);
         $f->get();
         $array=$f->getAttribut();
-        $r=h2(_('Catégorie').' '.$f->label,"");
+        $r="";
         $r.='<table style="width:98%;margin:1%">';
         foreach ($array as $attr)
         {
diff --git a/include/template/menu.php b/include/template/menu.php
index ab2c2b8..74cb261 100644
--- a/include/template/menu.php
+++ b/include/template/menu.php
@@ -35,7 +35,7 @@
        // Display the menu
        for($i=0;$i < count($amenu);$i++):
            if ( (count($amenu)==1)) {
-               $class="selectedcell";
+               $class="mtitle selectedcell";
 ?>
        <td class="<?php echo $class?>">
             <a class="mtitle" href="do.php?gDossier=<?php echo 
Dossier::id()?>&ac=<?php echo $access_code?>" title="<?php echo 
h(gettext($amenu[$i]['me_description']))?>" >
@@ -71,7 +71,7 @@
                             $url=$a_request[0].'/'.$a_request[1];
                         }
                         $url.='/'.$amenu[$i]['me_code'];
-                        if ($url == $access_code ) $class="selectedcell";
+                        if ($url == $access_code ) $class="mtitle 
selectedcell";
                         $url="do.php?gDossier=".Dossier::id()."&ac=".$url;
                     }