[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 13/13: minor changes : remove commented code,
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 13/13: minor changes : remove commented code, add new color for tags |
Date: |
Wed, 11 Nov 2020 10:23:45 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 8bd9ba4fb5754fd5ba8c6c20d6e98500e237ac9b
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Wed Nov 11 16:23:19 2020 +0100
minor changes : remove commented code, add new color for tags
---
html/js/scripts.js | 4 +-
html/style-classic7.css | 74 ++++++++++++++++++++++-
include/class/follow_up.class.php | 6 +-
include/class/follow_up_other_concerned.class.php | 29 +--------
include/template/detail-action.php | 1 +
include/template/tag_detail.php | 5 +-
6 files changed, 83 insertions(+), 36 deletions(-)
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 14a8a4f..12aa9bb 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2738,8 +2738,8 @@ function search_display_tag(p_dossier, p_prefix,p_object)
code_html = unescape_xml(code_html);
remove_waiting_box();
add_div({id: p_prefix + 'tag_div', style:
'left:10%;width:70%', cssclass: 'inner_box', drag: 1});
- $(p_prefix + 'tag_div').style.top = posY - 80 + "px";
- $(p_prefix + 'tag_div').style.left = posX - 200 + "px";
+ $(p_prefix + 'tag_div').style.top = calcy(200)+"px"
+ $(p_prefix + 'tag_div').style.left = 20+ "%";
remove_waiting_box();
$(p_prefix + 'tag_div').innerHTML = code_html;
code_html.evalScripts();
diff --git a/html/style-classic7.css b/html/style-classic7.css
index c4e12cf..6bb8ce0 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2582,4 +2582,76 @@ span.tagcell {
.tagcell-color20 {
background-color: yellow !important;
color: orangered !important;
-}
\ No newline at end of file
+}
+.tagcell-color21 {
+ background-color: #151514 !important;
+ color: orangered !important;
+}
+.tagcell-color22 {
+ background-color: #0f0f0e !important;
+ color: #ffef00 !important;
+}
+.tagcell-color23 {
+ background-color: #64644a !important;
+ color: #ffbf00 !important;
+}
+.tagcell-color24 {
+ color: orangered !important;
+}
+.tagcell-color25 {
+ color: #ff0606 !important;
+ font-style: oblique;
+}
+.tagcell-color26 {
+ background-color: #fff !important;
+ color: #03038a;
+}
+.tagcell-color27 {
+ color: #08030b !important;
+ background-image: linear-gradient(to right, rgb(227, 175, 175),
rgb(136, 13, 13));
+}
+.tagcell-color28 {
+ color: white !important;
+ background-image: linear-gradient(darkblue,lightblue) !important;
+}
+.tagcell-color29 {
+ background-color: yellow !important;
+ color: white !important;
+ background-image: linear-gradient(to right,black,yellow,red) !important;
+}
+.tagcell-color30 {
+ background-color: yellow !important;
+ color: white !important;
+ background-image: linear-gradient(to right,darkblue,white,red)
!important;
+}
+.tagcell-color31 {
+ color: #e1d5d0 !important;
+ background-image: linear-gradient(to bottom right, #9abbe3a8,#6f6fac,
#002ba3) !important;
+}
+.tagcell-color32 {
+ background-color: #ff00e3 !important;
+ font-family: SansationLight !important;
+}
+.tagcell-color33 {
+ color: white !important;
+ background-color: #8d3dcc !important;
+}
+.tagcell-color34 {
+ background-image: linear-gradient(to right,blue,white) !important;
+}
+.tagcell-color35 {
+ color: white !important;
+ background-image: linear-gradient(to right,#a61660,#e697d2) !important;
+}
+.tagcell-color36 {
+ background-image: linear-gradient(to right,#008000,#c8eec8) !important;
+ color: aquamarine !important;
+}
+/***************************************
+ * Button for linked card in follow up
+ * **************************************/
+#linked_card_bt {
+ font-size: 110%;
+ padding: 0.25em 1em 0.25em 1em;
+ font-family: bold;
+}
diff --git a/include/class/follow_up.class.php
b/include/class/follow_up.class.php
index f8c5929..0ce9e8f 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -694,9 +694,9 @@ class Follow_Up
$r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
// $r.='<th>'.$table->get_header(1).'</th>';
$r.=th('Priorité','style="width:5.57%"');
- $r.='<th style="min-width:52%">'.$table->get_header(6).'</th>';
+ $r.='<th style="min-width:45%">'.$table->get_header(6).'</th>';
$r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
- $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
+ $r.='<th style="max-width:10%">'.$table->get_header(3).'</th>';
$r.='<th style="width:5.57%">'.$table->get_header(4).'</th>';
$r.="</tr>";
@@ -778,7 +778,7 @@ class Follow_Up
$aTags=explode(",", $row["tags"]);
$nb_tag=count($aTags);
for ( $x=0;$x<$nb_tag;$x++) {
- $r.=sprintf('<span style="font-size:75%%"
class="tagcell-color%s">%s</span>',$aColor[$x],$aTags[$x]);
+ $r.=sprintf('<span
style="font-size:75%%;padding:1px;border-color:transparent" class="tagcell
tagcell-color%s">%s</span>',$aColor[$x],$aTags[$x]);
$r.=" ";
} // end loop $x
$r.='</a>';
diff --git a/include/class/follow_up_other_concerned.class.php
b/include/class/follow_up_other_concerned.class.php
index 33942d9..e2c457f 100644
--- a/include/class/follow_up_other_concerned.class.php
+++ b/include/class/follow_up_other_concerned.class.php
@@ -82,31 +82,6 @@ class Follow_Up_Other_Concerned
return false;
}
-// /**
-// * Display the other concerned (tiers, supplier...) in a small cell
-// * @return string
-// */
-// function display_linked()
-// {
-// $a_linked=$this->db->get_array('select ap_id,f_id from action_person
where ag_id=$1', array($this->ag_id));
-// if (count($a_linked)==0)
-// return "";
-// $dossier_id=Dossier::id();
-// for ($i=0; $i<count($a_linked); $i++)
-// {
-// $fiche=new Fiche($this->db, $a_linked[$i]['f_id']);
-// $qc=$fiche->get_quick_code();
-// $js_remove=sprintf("action_remove_concerned('%s','%s','%s')",
dossier::id(), $a_linked[$i]['f_id'],
-// $this->ag_id);
-// echo '<span class="tagcell">';
-// echo HtmlInput::anchor($qc,"",
sprintf("onclick=\"linked_card_option('%s','%s')\"",
-// $a_linked[$i]['ap_id'],$dossier_id));
-// echo Icon_Action::trash(uniqid(), $js_remove);
-// echo '</span>';
-// echo ' ';
-// echo ' ';
-// }
-// }
/**
* Display the count of other concerned card (tiers, supplier...) in
button which call
@@ -121,7 +96,7 @@ class Follow_Up_Other_Concerned
$javascript=<<<EOF
var
obj={dossier:$dossier_id,ag_id:$this->ag_id};action_concerned_list(obj);
EOF;
- echo HtmlInput::anchor_action(count($a_linked), $javascript, null,
"button");
+ echo HtmlInput::anchor_action(count($a_linked), $javascript,
'linked_card_bt', "button");
}
/**
@@ -246,4 +221,4 @@ EOF;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/include/template/detail-action.php
b/include/template/detail-action.php
index d930f53..b9ba146 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -255,6 +255,7 @@ function small(p_id_textarea){
// description
$description = new ITextarea("ag_description");
$description->id="ag_description";
+ $has_description = false;
//---------------------------------- Description
-------------------------------------------------------------------
if ( count($acomment)> 0) {
$has_description = true;
diff --git a/include/template/tag_detail.php b/include/template/tag_detail.php
index a2a9847..68bad65 100644
--- a/include/template/tag_detail.php
+++ b/include/template/tag_detail.php
@@ -30,7 +30,7 @@
$icheckbox->javascript='onclick="uncheck_other(this,\'tagcell_color\');"';
</p>
<?php
if ( $data->t_id == '-1') $data->t_color=1;
-$nb_color=20;
+$nb_color=36;
for ($i=1 ; $i != $nb_color+1 ; $i++ ) {
?>
@@ -41,7 +41,6 @@ for ($i=1 ; $i != $nb_color+1 ; $i++ ) {
echo $icheckbox->input();
?>
</span>
- <?php if ( $i % 5 == 0 ) echo '<br>';?>
<?php
} // end loop $i
@@ -59,4 +58,4 @@ if ( $data->t_id != '-1') :
<?php
endif;
-?>
\ No newline at end of file
+?>
- [Noalyss-commit] [noalyss] 01/13: Cosmetic : use H2, (continued)
- [Noalyss-commit] [noalyss] 01/13: Cosmetic : use H2, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 03/13: Compatibility edge, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 04/13: Minor : remove warning and typo, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 05/13: Follow_Up : other card, change presentation, use a button instead of displaying a lot of cells , one per card, the button calls a dialog box with the list of other cards, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 11/13: Bug : error end-of-file, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 09/13: Export FollowUp option doesn't work, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 12/13: Bug : followup detail operation: price Purchase or Sale, amount_from_type lost when searching , because exists in double, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 08/13: Tag sorted alphabetically, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 06/13: Tag : add color to tags, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 10/13: Bug : display unused other card options, Dany De Bontridder, 2020/11/11
- [Noalyss-commit] [noalyss] 13/13: minor changes : remove commented code, add new color for tags,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 07/13: task #0001697: Extension usage des étiquettes , tag on operation + export CSV + filter, Dany De Bontridder, 2020/11/11