merge delle modifiche mie con quelle di Sam, il resto invariato (fatto diff di tutta la dir)

elenco richiesta ancora da completare con inserimento dati ma grafica si avvicina ad access

grafica nuova con css importato da XPS


git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@41 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
This commit is contained in:
ermanno
2009-01-23 16:53:46 +00:00
parent e3af97e701
commit 45e1f67952
5 changed files with 761 additions and 331 deletions
+120 -34
View File
@@ -6,6 +6,14 @@
text-align:center;
color:Black;
}
.fixedValLeft
{
background-color:#cdcdcd;
text-align:left;
color:Black;
}
.textEv_1
{
background-color:#cdffcd;
@@ -13,6 +21,41 @@
color:Black;
}
.textEv_1Left
{
background-color:#cdffcd;
text-align:left;
color:Black;
}
.textEv_1Green
{
background-color:#99cc00;
text-align:center;
color:Black;
}
.textEv_1GreenLeft
{
background-color:#99cc00;
text-align:left;
color:Black;
}
.textEv_Read
{
background-color:#ccfefe;
text-align:center;
color:Black;
}
.textEv_ReadLeft
{
background-color:#ccfefe;
text-align:left;
color:Black;
}
.semaforoVerde
{
color: Green;
@@ -335,7 +378,7 @@
.topTitle
{
color: White;
color: Black;
font-family: Verdana Arial;
font-size: 26px;
font-weight: bold;
@@ -343,14 +386,14 @@
background-repeat: repeat-x;
background-position: 0% 0%;
background-attachment: scroll;
background-image: url(images/red32.png);
background-image: url(images/orangeGrad32.png);
}
.menuSx
{
font-size: 8pt;
width: 180px;
vertical-align: top;
height: 530px;
vertical-align: top; /*height: 530px;*/ /*height: 530px;*/
min-height: 530px; /*border-top: #0D0083 1px solid;*/ /*background-repeat: repeat-y; background-position: 0% 0%; background-attachment: scroll; background-image: url(images/menuSx5.png);*/ /*background: #DEE8F5;*/
background: #DEE8F5;
}
.ov_header
@@ -372,12 +415,10 @@
.navBar
{
font-size: 9pt;
background-color: #ededff;
border-right: #9999ff 1px solid;
border-top: #9999ff 1px solid;
border-left: #9999ff 1px solid;
border-bottom: #9999ff 1px solid;
font-size: 9pt; /*background-color: #DEE8F5;*/
background-color: #FFFFFF; /*border-right: #9999ff 1px solid; border-top: #9999ff 1px solid; border-left: #9999ff 1px solid; border-bottom: #9999ff 1px solid;*/
padding: 3px 3px 3px 3px;
margin: 3px 3px 3px 0px; /*background-color:#DEE8F5; font-family: Verdana Arial; font-size: 13px; font-weight: normal; background-repeat: repeat-x; background-position: 0% 0%; background-attachment: scroll; background-image: url(images/bluGrad32.png);*/
}
.hlBounce
{
@@ -418,10 +459,9 @@
}
.barraTitolo
{
background-color: maroon;
background-color: #FF7A00;/* #4C90FF; */
vertical-align: middle;
height: 20pt;
text-align: center;
}
INPUT
{
@@ -446,6 +486,8 @@ INPUT
{
padding: 0px;
margin: 2px;
/* con questo Table va a full screen */
width: 99%;
}
.topContrDx
{
@@ -468,6 +510,11 @@ INPUT
.contrRiq
{
border-left: solid 2px silver;
background-color: white;
border-top: solid 2px silver;
border-left: solid 2px silver;
border-right: solid 2px silver;
border-bottom: solid 1px silver;
}
.topSubMenuChk
{
@@ -507,9 +554,9 @@ INPUT
}
.bodyMainCenter
{
background-image: url(images/sfondo.png);
background-image: url(images/logo_sw.png);
vertical-align: middle;
border-left: maroon 1px solid;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
text-align: center;
height: 100%;
width: 100%;
@@ -520,7 +567,7 @@ INPUT
.bottomWrite
{
vertical-align: bottom;
border-top: maroon 1px solid;
border-top: #0D0083 1px solid;
margin-top: 2px;
padding-top: 2px;
font-size: 7pt;
@@ -545,6 +592,7 @@ INPUT
.pnlMenuSx
{
padding-right: 5px;
height: 530px;
}
A:hover
{
@@ -869,28 +917,20 @@ A:hover
}
.bodyMain
{
background-image: url(images/sfondo.png);
background-image: url(images/logo_sw.png);
vertical-align: top;
border-left: maroon 1px solid;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
height: 100%;
width: 100%;
background-position: center;
background-position: center; /*was topleft*/
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyMainEmpty
/*.bodyMainWhite
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainWhite
{
vertical-align: top;
border-left: maroon 1px solid;
border-left: #0D0083 1px solid;
height: 100%;
width: 100%;
background-position: center;
@@ -922,7 +962,7 @@ A:hover
background-attachment: scroll;
background-repeat: no-repeat;
}
*/
.logoUpSx
{
width: 200;
@@ -1071,7 +1111,7 @@ A:hover
.UnauthMess
{
font-size: 12pt;
font-style: italic;
font-style: normal;
margin-left: 30pt;
}
.tableHead
@@ -1316,7 +1356,8 @@ A:hover
}
.testoMed
{
font-size: 10pt;
font-size: 12pt;
font-weight: bold;
}
.txtTab
@@ -1382,6 +1423,15 @@ A:hover
color: Yellow;
text-align: center;
}
.navBar
{
font-size: 9pt;
background-color: #ededff;
border-right: #9999ff 1px solid;
border-top: #9999ff 1px solid;
border-left: #9999ff 1px solid;
border-bottom: #9999ff 1px solid;
}
.panelPaddingTitle
{
@@ -1418,6 +1468,14 @@ A:hover
}
/* sostituiti tutti i #5555bb del bordino tabellaalta e contornoriq con silver */
.wrap
{
overflow: auto;
white-space: normal;
}
.dropdownList
{
font-weight: normal;
@@ -1586,7 +1644,7 @@ A:hover
/* zona colorazione filtri */
.filtro_1
{
background-color: #9999ff;
background-color: #8888ff;
}
.filtro_2
{
@@ -1682,7 +1740,24 @@ A:hover
font-weight: bold;
color: White;
}
.ctrHeaderPagerRight
{
background-color: #b8b8b8;
font-weight: bold;
color: White;
text-align: right;
}
.ctrHeaderPagerBlue
{
background-color: #507CD1;
height: 1px;
}
.ctrHeaderPagerBlueRight
{
background-color: #507CD1;
height: 1px;
text-align: right;
}
.ctrFooter
{
background-color: #507CD1;
@@ -1699,6 +1774,16 @@ A:hover
vertical-align: top;
background-color: White;
}
.ctrRowStyleRight
{
background-color: #EFF3FB;
text-align: right;
}
.ctrAltRowStyleRight
{
background-color: White;
text-align: right;
}
.ctrInsRowStyle
{
background-color: #b8b8b8;
@@ -2731,7 +2816,8 @@ grViewBorder
padding: 1px 1px 1px 1px;
border-width: 2px;
border-style: solid;
background-color: #AAB8C9; /*background: #DEDEFF;*/
background-color: #AAB8C9;
/*background: #DEDEFF;*/
text-decoration: none;
}
.btnDisabled
+3
View File
@@ -4,7 +4,10 @@
<%@ Register Src="mod_elencoRichieste.ascx" TagName="mod_elencoRichieste" TagPrefix="uc1" %>
<%@ Register Src="mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento"
TagPrefix="uc2" %>
<%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc3" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_elencoRichieste ID="mod_elencoRichieste1" runat="server" />
<uc2:mod_dettaglioIntervento ID="mod_dettaglioIntervento1" runat="server" Visible="false" />
<uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
</asp:Content>
File diff suppressed because it is too large Load Diff
@@ -32,6 +32,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl
frmView_default.Visible = true;
frmView_full.Visible = false;
mod_interventoOpMtz1.Visible = false;
PanelInvisible.Visible = false;
}
private void traduciObj()
@@ -66,6 +67,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl
frmView_default.ChangeMode(FormViewMode.Edit);
frmView_default.Visible = true;
frmView_full.Visible = false;
PanelInvisible.Visible = false;
mod_interventoOpMtz1.Visible = true;
}
/// <summary>
@@ -78,6 +80,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl
frmView_full.ChangeMode(FormViewMode.Edit);
frmView_full.Visible = true;
frmView_default.Visible = false;
PanelInvisible.Visible = false;
mod_interventoOpMtz1.Visible = true;
}
/// <summary>
+3 -1
View File
@@ -24,12 +24,14 @@
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" />
</HeaderTemplate>
<ItemTemplate>
<div id="divLeft" style="text-align: left">
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
&nbsp;
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>'
Visible='<%# isDeletable(Eval("idxImpianto")) %>' />
</div>
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"