[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/06: Task #13 - GESTION : impression d'une
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 06/06: Task #13 - GESTION : impression d'une tâche : les commentaires remove old constructor |
|
Date: |
Fri, 05 Feb 2016 21:32:30 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit adcf8863b15dc6af90b9b6671a2bd4b5a2843db9
Author: Dany De Bontridder <address@hidden>
Date: Fri Feb 5 22:21:30 2016 +0100
Task #13 - GESTION : impression d'une tâche : les commentaires
remove old constructor
---
html/style-classic.css | 27 ++++++++++++++++++++-
html/style-light.css | 24 +++++++++++++++++++
html/style-mandarine.css | 24 +++++++++++++++++++
html/style-mobile.css | 37 ++++++++++++++++++++--------
html/style-print.css | 45 ++++++++++++++++++++++++------------
include/template/detail-action.php | 16 ++++++------
6 files changed, 138 insertions(+), 35 deletions(-)
diff --git a/html/style-classic.css b/html/style-classic.css
index f972e21..8722744 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2149,6 +2149,15 @@ td.selectedmenu {
.visible_gt800 {
}
+.field_follow_up
+{
+ margin-top:1px;
+ white-space: -moz-pre-wrap;
+ white-space: pre-wrap;
+ border:1px solid blue;
+ width:95%;
+}
+
@media only screen and (max-width:850px) {
.visible_gt800 {
display:none;
@@ -2167,4 +2176,20 @@ td.selectedmenu {
}
-}
\ No newline at end of file
+}
+/**
+ * go_up
+*/
+#go_up {
+ background-color: transparent;
+ border:0px;
+ font-size:300%;
+ box-shadow: none;
+ color:blue;
+
+}
+#go_up a ,#go_up a:visited{
+ background-image: none;
+ text-decoration: none;
+ color:blue;
+}
diff --git a/html/style-light.css b/html/style-light.css
index 4bb67b1..0a962ad 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -2099,4 +2099,28 @@ button.cancel {
td.selectedmenu {
+}
+.field_follow_up
+{
+ margin-top:1px;
+ white-space: -moz-pre-wrap;
+ white-space: pre-wrap;
+ border:1px solid blue;
+ width:95%;
+}
+/**
+ * go_up
+*/
+#go_up {
+ background-color: transparent;
+ border:0px;
+ font-size:300%;
+ box-shadow: none;
+ color:blue;
+
+}
+#go_up a ,#go_up a:visited{
+ background-image: none;
+ text-decoration: none;
+ color:blue;
}
\ No newline at end of file
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index 0099a82..8677fcf 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -2097,4 +2097,28 @@ div.autocomplete_fixed ul li {
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;
}
\ No newline at end of file
diff --git a/html/style-mobile.css b/html/style-mobile.css
index c53de97..4ad8099 100644
--- a/html/style-mobile.css
+++ b/html/style-mobile.css
@@ -1405,15 +1405,7 @@ h1.title {
text-transform: uppercase;
}
h2.title {
-
-// background: rgb(149,149,149); /* Old browsers */
-// background: -moz-linear-gradient(top, rgba(149,149,149,1) 0%,
rgba(13,13,13,1) 46%, rgba(1,1,1,1) 50%, rgba(10,10,10,1) 53%, rgba(78,78,78,1)
76%, rgba(56,56,56,1) 87%, rgba(27,27,27,1) 100%); /* FF3.6+ */
-// background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,rgba(149,149,149,1)), color-stop(46%,rgba(13,13,13,1)),
color-stop(50%,rgba(1,1,1,1)), color-stop(53%,rgba(10,10,10,1)),
color-stop(76%,rgba(78,78,78,1)), color-stop(87%,rgba(56,56,56,1)),
color-stop(100%,rgba(27,27,27,1))); /* Chrome,Safari4+ */
-// background: -webkit-linear-gradient(top, rgba(149,149,149,1)
0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1)
76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Chrome10+,Safari5.1+ */
-// background: -o-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1)
46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1)
76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Opera 11.10+ */
-// background: -ms-linear-gradient(top, rgba(149,149,149,1)
0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1)
76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* IE10+ */
-///background: linear-gradient(to bottom, rgba(149,149,149,1)
0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1)
76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* W3C */
- background: #606c88; /* Old browsers */
+ 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+ */
@@ -1421,7 +1413,6 @@ h2.title {
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 */
-//filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#959595',
endColorstr='#1b1b1b',GradientType=0 ); /* IE6-9 */
color:#FFFFFF;
text-align:center;
padding:0.24%;
@@ -1899,7 +1890,7 @@ ul.aligned-block li {
background: snow;
margin-top: 50px;
}
-// Selected cell in the module
+/* Selected cell in the module */
td.toolselected {background-color: #909BA7; }
/***************************************************************************
* column in the dashboard
@@ -2040,4 +2031,28 @@ button.cancel {
td.selectedmenu {
+}
+.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;
}
\ No newline at end of file
diff --git a/html/style-print.css b/html/style-print.css
index 729ec56..20cfcab 100644
--- a/html/style-print.css
+++ b/html/style-print.css
@@ -14,6 +14,7 @@ form {
.print {
font-size:10pt;
display: block;
+ visibility: visible;
}
.noprint {
display:none;
@@ -32,17 +33,17 @@ table.result {
}
table.result th {
- font-size:105%;
+ font-size:10pt;
font-family:sans-serif;
}
h3,h4 {
- font-size:110%;
+ font-size:12pt;
text-decoration: underline;
font-family:sans-serif;
}
h2 {
- font-size:110%;
+ font-size:12pt;
font-weight:bold;
font-family:sans-serif;
}
@@ -53,7 +54,7 @@ div.info {
font-size:10pt;
}
h1.content,h1,h2.info,legend {
- font-size:120%;
+ font-size:12pt;
font-weight:bold;
font-family:sans-serif;
}
@@ -257,40 +258,54 @@ a.detail:hover
font-size:10pt;
}
h1.title {
- font-size:120%;
+ font-size:12pt;
font-style: italic;
}
h2.title {
- font-size:110%;
+ font-size:12pt;
font-style: italic;
margin-left: 3em;
}
h3.title {
- font-size:110%;
+ font-size:12pt;
margin-left: 3em;
}
h4.title {
color: blue;
- font-size:110%;
- margin-left: 3em;
+ font-size:12pt;
+ margin-left: 10pt;
text-decoration: underline;
}
h5.title {
color: blue;
- font-size:110%;
- margin-left: 3em;
+ font-size:11pt;
+ margin-left: 10pt;
text-decoration: none;
font-style: italic;
}
/* </style> */
div.myfieldset
{
- margin-top: 3em;
- margin-left:3em;
- margin-right: 3em;
- border:lightgrey 2px groove;
+ margin-top: 20pt;
+ margin-left:20pt;
+ margin-right: 20pt;
+ border:lightgrey 0.5pt groove;
}
#info_div ,div#error_div ,div#close_div{
display:none;
}
p#breakhere {page-break-before: always}
+
+.field_follow_up
+{
+ font-size:9pt;
+ margin-top:10pt;
+ word-break: normal;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+
+
+}
+.tinybutton {
+ display:none;
+}
\ No newline at end of file
diff --git a/include/template/detail-action.php
b/include/template/detail-action.php
index 2821975..13e9675 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -162,12 +162,12 @@ $uniq=HtmlInput::generate_id("tab");
</div>
<div id="choice_other_info_div" style="float:left;">
- <ul class="tabs">
+ <ul class="tabs noprint" >
<li id="related_action_tab<?php echo $uniq?>"
class="tabs_selected"><?php echo _("Actions concernées")?></li>
<li id="related_operation_tab<?php echo $uniq?>" class="tabs"><?php
echo _('Opérations concernées')?></li>
<li id="dependant_action_tab<?php echo $uniq?>" class="tabs"><?php
echo _('Dépendant')?></li>
</ul>
- <div id="related_operation_div<?php echo $uniq?>" style="display:none">
+ <div id="related_operation_div<?php echo $uniq?>" style="display:none"
class="print">
<ol>
@@ -194,7 +194,7 @@ $uniq=HtmlInput::generate_id("tab");
<?php if ($p_view != 'READ') echo '<span
class="noprint">'.$iconcerned->input().'</span>';?>
</div>
- <div id="related_action_div<?php echo $uniq?>">
+ <div id="related_action_div<?php echo $uniq?>" class="print">
@@ -205,7 +205,7 @@ $uniq=HtmlInput::generate_id("tab");
<?php if ( $p_view != 'READ') echo '<span
class="noprint">'.$iaction->input().'</span>';?>
</div>
- <div id="dependant_action_div<?php echo $uniq?>" style="display:none">
+ <div id="dependant_action_div<?php echo $uniq?>" style="display:none"
class="print">
<?php
$this->display_parent($p_view,$p_base);
?>
@@ -229,11 +229,11 @@ function small(p_id_textarea){
}
</script>
- <p style="margin-left:100px">
+ <p style="margin-left:10px;">
<?php echo $title->input();
?>
</p>
- <div style="margin-left:100px">
+ <div style="margin-left:10px;">
<?php
$style_enl='style="display:inline"';$style_small='style="display:none"';
@@ -249,14 +249,14 @@ for( $c=0;$c<count($acomment);$c++){
$acomment[$c]['agc_id']);
$js= '<a class="tinybutton"
id="accom'.$acomment[$c]['agc_id'].'" href="javascript:void(0)"
onclick="'.$rmComment.'">'.SMALLX.'</a>';
echo h($m_desc.'
'.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']."
".$acomment[$c]['str_agc_date'].')').$js.
- '<pre style="margin-top:1px;white-space:
-moz-pre-wrap;white-space: pre-wrap;border:1px solid blue;width:80%;"
id="com'.$acomment[$c]['agc_id'].'"> '.
+ '<pre class="field_follow_up"
id="com'.$acomment[$c]['agc_id'].'"> '.
" ".h($acomment[$c]['agc_comment']).'</pre>'
;
}
else
{
echo h($m_desc.'
'.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']."
".$acomment[$c]['str_agc_date'].')').
- '<pre style="margin-top:1px;white-space:
-moz-pre-wrap;white-space: pre-wrap;border:1px solid blue;width:80%;"
id="com'.$acomment[$c]['agc_id'].'"> '.
+ '<pre class="field_follow_up"
id="com'.$acomment[$c]['agc_id'].'"> '.
" ".h($acomment[$c]['agc_comment']).'</pre>'
;
- [Noalyss-commit] [noalyss] branch master updated (260111c -> adcf886), Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 01/06: correct comment, Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 03/06: clean folder, Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 04/06: Verify value of PS2PDF and PDF2PS when FIX_BROKEN_PDF is set to yes, Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 05/06: remove old constructor, Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 02/06: Verify value of PS2PDF and PDF2PS when FIX_BROKEN_PDF is set to yes, Dany De Bontridder, 2016/02/05
- [Noalyss-commit] [noalyss] 06/06: Task #13 - GESTION : impression d'une tâche : les commentaires remove old constructor,
Dany De Bontridder <=