diff --git a/GPW_Admin/Bundle.config b/GPW_Admin/Bundle.config index 5c69528..05925b4 100644 --- a/GPW_Admin/Bundle.config +++ b/GPW_Admin/Bundle.config @@ -2,13 +2,12 @@ - + - \ No newline at end of file diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index 386f6b4..e03e6c6 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -4,20 +4,6 @@ body { padding-bottom: 20px;*/ font: 'Roboto', sans-serif; } -.logo { - background-image: url(../images/logo_sw.png); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - -ms-filter: "alpha(opacity=50)"; - filter: alpha(opacity=50); - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.5); - opacity: 0.5; - width: 800px; - height: 300px; - margin: 50px auto 50px auto; - vertical-align: middle; - background-repeat: no-repeat; -} /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { @@ -36,6 +22,106 @@ body { .textBig { font-size: 1.5em; } +/*------------------------------------------------------------------ +[ Shortcuts / .shortcuts ] +*/ +.shortcuts { + text-align: center; +} +.shortcuts .shortcut { + min-width: 9rem; + min-height: 5rem; + display: inline-block; + padding: 0.66666667rem 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: 0.5rem; +} +.shortcuts .shortcut-sm { + min-width: 4.5rem; + min-height: 3rem; + display: inline-block; + padding: 0.25rem 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: 0.5rem; +} +.shortcuts .shortcut .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: 2rem; + color: #333; +} +.shortcuts .shortcut-sm .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: 2rem; + color: #333; +} +.shortcuts .shortcut:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} +.shortcuts .shortcut-sm:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} +.shortcuts .shortcut:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.shortcuts .shortcut-sm:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.shortcuts .shortcut:hover .shortcut-icon { + color: #C93; +} +.shortcuts .shortcut-sm:hover .shortcut-icon { + color: #666; +} +.shortcuts .shortcut-label { + display: block; + margin-top: 0.75em; + font-weight: 400; + color: #666; +} +@media (max-width: 992px) { + .shortcuts .shortcut { + min-width: 8rem; + min-height: 4rem; + } +} /* Set widths on the form inputs since otherwise they're 100% wide */ /*input, select, diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index e3598e6..1a70058 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -5,21 +5,6 @@ body { font: 'Roboto', sans-serif; } -.logo { - background-image: url(../images/logo_sw.png); - -khtml-opacity: .50; - -moz-opacity: .50; - -ms-filter: "alpha(opacity=50)"; - filter: alpha(opacity=50); - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.5); - opacity: .50; - width: 800px; - height: 300px; - margin: 50px auto 50px auto; - vertical-align: middle; - background-repeat: no-repeat; -} - /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { @@ -42,6 +27,121 @@ body { font-size: 1.5em; } +/*------------------------------------------------------------------ +[ Shortcuts / .shortcuts ] +*/ + +@blSCut: 1rem; + +.shortcuts { + text-align: center; +} + +.shortcuts .shortcut { + min-width: @blSCut * 9; + min-height: @blSCut * 5; + display: inline-block; + padding: @blSCut*2/3 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; +} + +.shortcuts .shortcut-sm { + min-width: @blSCut * 4.5; + min-height: @blSCut * 3; + display: inline-block; + padding: @blSCut/4 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; +} + +.shortcuts .shortcut .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; +} + +.shortcuts .shortcut-sm .shortcut-icon { + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; +} + +.shortcuts .shortcut:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} + +.shortcuts .shortcut-sm:hover { + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); +} + +.shortcuts .shortcut:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} + +.shortcuts .shortcut-sm:active { + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} + +.shortcuts .shortcut:hover .shortcut-icon { + color: #C93; +} + +.shortcuts .shortcut-sm:hover .shortcut-icon { + color: #666; +} + +.shortcuts .shortcut-label { + display: block; + margin-top: .75em; + font-weight: 400; + color: #666; +} + +@media (max-width: 992px) { + .shortcuts .shortcut { + min-width: @blSCut * 8; + min-height: @blSCut * 4; + } +} /* Set widths on the form inputs since otherwise they're 100% wide */ /*input, select, diff --git a/GPW_Admin/Content/Site.min.css b/GPW_Admin/Content/Site.min.css index 75d169e..df9f274 100644 --- a/GPW_Admin/Content/Site.min.css +++ b/GPW_Admin/Content/Site.min.css @@ -1 +1 @@ -body{font:'Roboto',sans-serif;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file +body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file diff --git a/GPW_Admin/Content/Style.css b/GPW_Admin/Content/Style.css index 72c472e..19078b1 100644 --- a/GPW_Admin/Content/Style.css +++ b/GPW_Admin/Content/Style.css @@ -16,12 +16,12 @@ } .logo { background-image: url(../images/logo_sw.png); - -khtml-opacity: .50; - -moz-opacity: .50; + -khtml-opacity: 0.5; + -moz-opacity: 0.5; -ms-filter: "alpha(opacity=50)"; filter: alpha(opacity=50); filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.5); - opacity: .50; + opacity: 0.5; width: 800px; height: 300px; margin: 50px auto 50px auto; @@ -30,12 +30,12 @@ } .logo:hover { background-image: url(../images/logo_sw.png); - -khtml-opacity: 1.0; - -moz-opacity: 1.0; + -khtml-opacity: 1; + -moz-opacity: 1; -ms-filter: "alpha(opacity=100)"; filter: alpha(opacity=100); filter: progid:DXImageTransform.Microsoft.Alpha(opacity=1); - opacity: 1.0; + opacity: 1; width: 800px; height: 300px; margin: 50px auto 50px auto; diff --git a/GPW_Admin/Content/Style.less b/GPW_Admin/Content/Style.less index a293c58..c0b6b53 100644 --- a/GPW_Admin/Content/Style.less +++ b/GPW_Admin/Content/Style.less @@ -5,19 +5,19 @@ @import url('../Content/JQClock.css'); * { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -*:before, -*:after { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; } -.logo -{ +*:before, +*:after { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +.logo { background-image: url(../images/logo_sw.png); -khtml-opacity: .50; -moz-opacity: .50; @@ -28,11 +28,11 @@ width: 800px; height: 300px; margin: 50px auto 50px auto; - vertical-align:middle; + vertical-align: middle; background-repeat: no-repeat; } -.logo:hover -{ + +.logo:hover { background-image: url(../images/logo_sw.png); -khtml-opacity: 1.0; -moz-opacity: 1.0; @@ -43,12 +43,11 @@ width: 800px; height: 300px; margin: 50px auto 50px auto; - vertical-align:middle; + vertical-align: middle; background-repeat: no-repeat; } -.bodyMainCenter -{ +.bodyMainCenter { /* background-image: url(../images/logo_sw.png); -khtml-opacity: .50; -moz-opacity: .50; -ms-filter: "alpha(opacity=50)"; filter: alpha(opacity=50); filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.5); opacity: .50; */ vertical-align: middle; border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/ @@ -59,28 +58,27 @@ background-attachment: scroll; background-repeat: no-repeat; } -.bodyCenter -{ + +.bodyCenter { vertical-align: middle; text-align: center; height: 100%; width: 100%; } -.centerMenu -{ + +.centerMenu { background-color: White; text-align: center; border-width: thin; border-style: groove; border-color: Blue; } -A:hover -{ + +A:hover { color: red; } -.bodyMain -{ +.bodyMain { /* background-image: url(../images/logo_sw.png); -khtml-opacity: .50; -moz-opacity: .50; -ms-filter: "alpha(opacity=50)"; filter: alpha(opacity=50); filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.5); opacity: .50; */ vertical-align: top; border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/ @@ -90,16 +88,15 @@ A:hover background-attachment: scroll; background-repeat: no-repeat; } -.bodyMainEmpty -{ + +.bodyMainEmpty { vertical-align: top; border-left: maroon 1px solid; height: 100%; width: 100%; } -.bodyMainWhite -{ +.bodyMainWhite { vertical-align: top; border-left: maroon 1px solid; height: 100%; @@ -109,21 +106,18 @@ A:hover background-repeat: no-repeat; } -.bodyMainWhite a:hover -{ +.bodyMainWhite a:hover { color: white; } -.bodyMainNoLogo -{ +.bodyMainNoLogo { vertical-align: top; border-left: maroon 1px solid; height: 100%; width: 100%; } -.bodyMainLogoPiccolo -{ +.bodyMainLogoPiccolo { background-image: url(../images/sfondoMedio.png); background-position: 97% 210px; vertical-align: top; @@ -132,4 +126,4 @@ A:hover width: 100%; background-attachment: scroll; background-repeat: no-repeat; -} +} \ No newline at end of file diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 8f63f23..0a3043c 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -351,6 +351,7 @@ + @@ -526,6 +527,7 @@ + @@ -889,6 +891,13 @@ cmp_footer.ascx + + cmp_homeButtons.ascx + ASPXCodeBehind + + + cmp_homeButtons.ascx + cmp_menuTop.ascx ASPXCodeBehind diff --git a/GPW_Admin/WebMasterPages/BMP.Master b/GPW_Admin/WebMasterPages/BMP.Master index 647ccdf..3069ec8 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master +++ b/GPW_Admin/WebMasterPages/BMP.Master @@ -63,7 +63,7 @@ -
+
@@ -92,4 +92,4 @@ - + \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_homeButtons.ascx b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx new file mode 100644 index 0000000..0104329 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_homeButtons.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_homeButtons" %> + +
+
+
+ + + + + + + <%# XPath("@title")%> + + + + + + + + + +
+
+
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.cs b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.cs new file mode 100644 index 0000000..d09aca9 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.cs @@ -0,0 +1,53 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GPW_Admin.WebUserControls +{ + public partial class cmp_homeButtons : System.Web.UI.UserControl + { + #region Private Methods + + /// + /// aggiornamento del menù + /// + private void updateTreeMenu() + { + try + { + if (string.IsNullOrEmpty(user_std.UtSn.mappaSito)) + { + Response.Redirect("Default", true); + } + else + { + XmlMenu.Data = user_std.UtSn.mappaSito; + XmlMenu.XPath = "mainMenu/menu"; + XmlMenu.DataBind(); + } + } + catch + { + Response.Redirect("Default", true); + } + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + updateTreeMenu(); + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.designer.cs new file mode 100644 index 0000000..b286687 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_homeButtons.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace GPW_Admin.WebUserControls +{ + + + public partial class cmp_homeButtons + { + + /// + /// Controllo menu. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Repeater menu; + + /// + /// Controllo XmlMenu. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu; + } +} diff --git a/GPW_Admin/WebUserControls/cmp_menuTop.ascx b/GPW_Admin/WebUserControls/cmp_menuTop.ascx index 319f23f..e3ed486 100644 --- a/GPW_Admin/WebUserControls/cmp_menuTop.ascx +++ b/GPW_Admin/WebUserControls/cmp_menuTop.ascx @@ -3,7 +3,7 @@
- + \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx index 5b7a964..4cda909 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx @@ -4,44 +4,30 @@ { %> <% } %> -
- - - - - - - - - - - - +
+ + + + + + + + + - - + + - - + + - - + + - - - @@ -180,6 +166,21 @@ + + + + + + + + + + + + @@ -192,38 +193,20 @@ + + + - - + + - - - - - - - - - - - - - - + @@ -243,6 +226,7 @@ + @@ -258,6 +242,7 @@ + @@ -265,4 +250,6 @@
\ No newline at end of file + TypeName="GPW_data.DS_UtilityTableAdapters.v_selCodOrarioTableAdapter"> + \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs index 73e68af..7bf3d82 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs @@ -49,5 +49,14 @@ namespace GPW_Admin.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsOrario; + + /// + /// Controllo odsGruppi. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsGruppi; } } diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx b/GPW_Admin/WebUserControls/mod_adminFasi.ascx index 536ec3e..af10a5f 100644 --- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx +++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx @@ -5,235 +5,238 @@ { %> <% } %> -
-
- Progetti + + + +
+
+
+
+ Progetti +
+
+ + +
+
+ + + + + + + +
+
-
- - -
-
- - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
- <%----%> -
- +
+
+ +
+ <%----%> +
+ +
-
- - -
- -
-
- -   + + +
+ +
+
+ +   -
- - -
- -
-
- -   +
+ + +
+ +
+
+ +   -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + / -
- - - - - - - - - - - - - - - - - - - - - - <%: traduci("AddNewSubFase") %> - <%-- + + + + + + + + + + + + + + + + + + + + + + <%: traduci("AddNewSubFase") %> + <%----%> - - - - - - - <%# traduci("NewFaseExpl") %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + <%# traduci("NewFaseExpl") %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs index 81e94f8..9b47d6c 100644 --- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs @@ -12,113 +12,17 @@ namespace GPW_Admin.WebUserControls { public partial class mod_adminFasi : System.Web.UI.UserControl { - public bool showReturnProj - { - get - { - return divReturn.Visible; - } - set - { - divReturn.Visible = value; - } - } - #region area standard (non modificare) - - #region gestione eventi - - public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; - - #endregion - - /// - /// effettua traduzione del lemma - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - - /// - /// aggiorno visualizzazione fasi! - /// - /// - /// - void filtroPrj_eh_selValore(object sender, EventArgs e) - { - salveFilterPrj(); - } - /// - /// reset della selezione - /// - /// - /// - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - /// - /// inserisce nuovo valore da footer - /// - /// - /// - protected void lblIns_click(object sender, EventArgs e) - { - // click su inserimento, chiamo il metodo insert dell'ObjectDataSource - ods.Insert(); - } - /// - /// annulla inserimento nuovo valore da footer - /// - /// - /// - protected void lblCanc_click(object sender, EventArgs e) - { - // annullo inserimento: nascondo footer, bind controlli... - grView.FooterRow.Visible = false; - } - /// - /// traduce gli header delle colonne - /// - /// - /// - protected void grView_DataBound(object sender, EventArgs e) - { - if (grView.Rows.Count > 0) - { - LinkButton lb; - // aggiorno gli headers - foreach (TableCell cella in grView.HeaderRow.Cells) - { - try - { - lb = (LinkButton)cella.Controls[0]; - lb.Text = traduci(lb.Text); - } - catch - { } - } - int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); - lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); - } - else - { - lblNumRec.Text = ""; - } - } - - #endregion - - #region area CUSTOM (da modificare) - - #region gestione eventi + #region Public Events public event EventHandler eh_faseSel; - #endregion + public event EventHandler eh_nuovoValore; + + public event EventHandler eh_resetSelezione; + + #endregion Public Events + + #region Protected Properties /// /// uid base @@ -131,6 +35,72 @@ namespace GPW_Admin.WebUserControls } } + #endregion Protected Properties + + #region Public Properties + + /// + /// pagina corrente (URL finale) + /// + public string _paginaCorrente { get; set; } + + public string CardStyle + { + get + { + return hfCardStyle.Value; + } + set + { + hfCardStyle.Value = value; + divCardMain.Attributes.Remove("class"); + divCardHeader.Attributes.Remove("class"); + divCardMain.Attributes.Add("class", $"card border-{value}"); + divCardHeader.Attributes.Add("class", $"card-header bg-{value}"); + } + } + + /// + /// abilitazione/disabilitazione gestione cambio cliente + /// + public bool changeSelCliEnabled + { + get + { + return filtroCli.changeSelEnabled; + } + set + { + filtroCli.changeSelEnabled = value; + } + } + + /// + /// controllo stato licenze! + /// + public bool chkLicOk + { + get + { + return (licenzeGPW.utentiAttivi < licenzeGPW.licenzeAttive); + } + } + + /// + /// determina se sia visibile pnl dettaglio RA della fase selezionata + /// + public bool enableShowRA + { + get + { + return pnlDetRA.Visible; + } + set + { + pnlDetRA.Visible = value; + } + } + /// /// idx del cliente selezionato /// @@ -145,20 +115,7 @@ namespace GPW_Admin.WebUserControls memLayer.ML.setSessionVal(string.Format("idxCli_{0}", sessionUid), value); } } - /// - /// idx del progetto selezionato - /// - public int idxProgetto - { - get - { - return memLayer.ML.IntSessionObj(string.Format("idxProj_{0}", sessionUid)); - } - set - { - memLayer.ML.setSessionVal(string.Format("idxProj_{0}", sessionUid), value); - } - } + /// /// valore della fase selezionata /// @@ -179,10 +136,269 @@ namespace GPW_Admin.WebUserControls return answ; } } + /// - /// pagina corrente (URL finale) + /// idx del progetto selezionato /// - public string _paginaCorrente { get; set; } + public int idxProgetto + { + get + { + return memLayer.ML.IntSessionObj(string.Format("idxProj_{0}", sessionUid)); + } + set + { + memLayer.ML.setSessionVal(string.Format("idxProj_{0}", sessionUid), value); + } + } + + public bool showReturnProj + { + get + { + return divReturn.Visible; + } + set + { + divReturn.Visible = value; + } + } + + #endregion Public Properties + + #region Private Methods + + /// + /// cambio sel cliente --> aggiorno progetti + /// + /// + /// + private void filtroCli_eh_selValore(object sender, EventArgs e) + { + saveFilterCli(); + salveFilterPrj(); + } + + /// + /// aggiorno visualizzazione fasi! + /// + /// + /// + private void filtroPrj_eh_selValore(object sender, EventArgs e) + { + salveFilterPrj(); + } + + /// + /// salva filtro prj + /// + private void salveFilterPrj() + { + //memLayer.ML.setSessionVal("idxProgetto_sel", filtroPrj.valore); + idxProgetto = filtroPrj.valoreInt; + grView.DataBind(); + } + + /// + /// salva filtro cliente + /// + private void saveFilterCli() + { + // salvo filtro cliente + //memLayer.ML.setSessionVal("idxCli_sel", filtroCli.valore); + idxCliente = filtroCli.valoreInt; + filtroPrj.ods = odsProj; + filtroPrj.reselFirst(); + } + + /// + /// sistema visibilità area dettaglio RA + /// + private void setDetVisibility() + { + pnlDetRA.Visible = enableShowRA; + lblDet.Visible = (grView.SelectedIndex >= 0); + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// gestione evento richiesta nuovo valore (mostra footer, ...) + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (e != null && sender != null) + { + // controllo se c'è un argument x la fase... + string idxFaseAncest = "0"; + try + { + idxFaseAncest = ((ImageButton)sender).CommandArgument; + } + catch + { } + memLayer.ML.setSessionVal("idxFaseAncest", idxFaseAncest); + if (idxFaseAncest == "0") + { + // reset selezione... + resetSelezione(); + } + // mostro il footer oppure la riga dei dettagli x nuovo... + if (grView.FooterRow != null) + { + grView.FooterRow.Visible = true; + } + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } + } + + /// + /// gestione evento richiesta nuovo valore QUANDO NON CI SIANO RECORDS! + /// + /// + /// + protected void btnNewEmpty_Click(object sender, EventArgs e) + { + memLayer.ML.setSessionVal("idxFaseAncest", "0"); + DataProxy.DP.taAF.insertQuery(idxProgetto, 0, "NuovaFase", "DescrizioneFase", false, false, 0, 0, true); + grView.DataBind(); + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } + + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + /// + /// elenco colonne del datagrid + /// + /// + protected DataColumnCollection colonneObj() + { + DataColumnCollection colonne = null; + using (DS_Applicazione.AnagFasiDataTable tabella = new DS_Applicazione.AnagFasiDataTable()) + { + colonne = tabella.Columns; + } + return colonne; + } + + /// + /// traduce gli header delle colonne + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + + /// + /// indico cambio selezione valore... + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + setDetVisibility(); + if (eh_faseSel != null) + { + eh_faseSel(this, new EventArgs()); + } + } + + /// + /// annulla inserimento nuovo valore da footer + /// + /// + /// + protected void lblCanc_click(object sender, EventArgs e) + { + // annullo inserimento: nascondo footer, bind controlli... + grView.FooterRow.Visible = false; + } + + /// + /// inserisce nuovo valore da footer + /// + /// + /// + protected void lblIns_click(object sender, EventArgs e) + { + // click su inserimento, chiamo il metodo insert dell'ObjectDataSource + ods.Insert(); + } + + /// + /// check licenze in fase di update... + /// + /// + /// + protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { + if (!licenzeGPW.checkLicenze) + { + if (e != null) + { + // annullo insert se licenze sforate... + e.Cancel = true; + grView.EditIndex = -1; + grView.DataBind(); + } + } + } + + /// + /// salva in variabile pagina il nome della pagina corrente + /// + protected void PagCorrente() + { + Uri MyUrl = Request.Url; + string delimStr = "/"; + char[] delimiter = delimStr.ToCharArray(); + string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); + int n = finalUrl.Length; + _paginaCorrente = finalUrl[n - 1].ToString(); + } + /// /// caricamento /// @@ -203,56 +419,6 @@ namespace GPW_Admin.WebUserControls grView.PageSize = utils.pageSize; setDetVisibility(); } - /// - /// salva in variabile pagina il nome della pagina corrente - /// - protected void PagCorrente() - { - Uri MyUrl = Request.Url; - string delimStr = "/"; - char[] delimiter = delimStr.ToCharArray(); - string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); - int n = finalUrl.Length; - _paginaCorrente = finalUrl[n - 1].ToString(); - } - /// - /// sistema visibilità area dettaglio RA - /// - private void setDetVisibility() - { - pnlDetRA.Visible = enableShowRA; - lblDet.Visible = (grView.SelectedIndex >= 0); - } - /// - /// salva filtro cliente - /// - private void saveFilterCli() - { - // salvo filtro cliente - //memLayer.ML.setSessionVal("idxCli_sel", filtroCli.valore); - idxCliente = filtroCli.valoreInt; - filtroPrj.ods = odsProj; - filtroPrj.reselFirst(); - } - /// - /// salva filtro prj - /// - private void salveFilterPrj() - { - //memLayer.ML.setSessionVal("idxProgetto_sel", filtroPrj.valore); - idxProgetto = filtroPrj.valoreInt; - grView.DataBind(); - } - /// - /// cambio sel cliente --> aggiorno progetti - /// - /// - /// - void filtroCli_eh_selValore(object sender, EventArgs e) - { - saveFilterCli(); - salveFilterPrj(); - } /// /// recupera i dati di un nuovo record contenuti nel footer di un gridView; @@ -292,12 +458,15 @@ namespace GPW_Admin.WebUserControls case "textBox": e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; break; + case "dropDownList": e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; break; + case "checkBox": e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; break; + default: break; } @@ -316,96 +485,11 @@ namespace GPW_Admin.WebUserControls } } } - /// - /// gestione evento richiesta nuovo valore (mostra footer, ...) - /// - /// - /// - protected void btnNew_Click(object sender, EventArgs e) - { - if (e != null && sender != null) - { - // controllo se c'è un argument x la fase... - string idxFaseAncest = "0"; - try - { - idxFaseAncest = ((ImageButton)sender).CommandArgument; - } - catch - { } - memLayer.ML.setSessionVal("idxFaseAncest", idxFaseAncest); - if (idxFaseAncest == "0") - { - // reset selezione... - resetSelezione(); - } - // mostro il footer oppure la riga dei dettagli x nuovo... - if (grView.FooterRow != null) - { - grView.FooterRow.Visible = true; - } - // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } - } - } - /// - /// gestione evento richiesta nuovo valore QUANDO NON CI SIANO RECORDS! - /// - /// - /// - protected void btnNewEmpty_Click(object sender, EventArgs e) - { - memLayer.ML.setSessionVal("idxFaseAncest", "0"); - DataProxy.DP.taAF.insertQuery(idxProgetto, 0, "NuovaFase", "DescrizioneFase", false, false, 0, 0, true); - grView.DataBind(); - // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } - } - /// - /// elenco colonne del datagrid - /// - /// - protected DataColumnCollection colonneObj() - { - DataColumnCollection colonne = null; - using (DS_Applicazione.AnagFasiDataTable tabella = new DS_Applicazione.AnagFasiDataTable()) - { - colonne = tabella.Columns; - } - return colonne; - } - /// - /// determina se sia eliminabile il record (=non usato) - /// - /// - /// - public bool delEnabled(object idxObj) - { - bool answ = isWritable(); - // solo se ha diritti scrittura controllo - if (idxObj != null) - { - if (answ) - { - int trovati = 0; - int idxFase = 0; - _ = int.TryParse(idxObj.ToString(), out idxFase); - trovati = DataProxy.DP.taRA.getByFase(idxFase).Count; - // controllo se ci sono record correlati... - if (trovati > 0) - { - answ = false; - } - } - } - return answ; - } + + #endregion Protected Methods + + #region Public Methods + /// /// calcola classe css dato codice fase /// @@ -436,89 +520,7 @@ namespace GPW_Admin.WebUserControls } return answ; } - /// - /// determina dimensioni dell'oggetto spaziatore data la fase - /// - /// - /// - public Unit widthByCod(object codFase) - { - Unit answ = new Unit(0, UnitType.Pixel); - int livello = 0; - if (codFase != null) - { - // calcolo livello come num punti "." -1... - try - { - string[] array = codFase.ToString().Split('.'); - livello = array.Length; - } - catch - { } - if (livello >= 4) - { - answ = new Unit((livello - 3) * 10, UnitType.Pixel); - } - } - return answ; - } - /// - /// inverte valore booleano - /// - /// - /// - public bool invBool(object valore) - { - bool answ = true; - try - { - answ = !Convert.ToBoolean(valore); - } - catch - { } - return answ; - } - /// - /// abilitazione/disabilitazione gestione cambio cliente - /// - public bool changeSelCliEnabled - { - get - { - return filtroCli.changeSelEnabled; - } - set - { - filtroCli.changeSelEnabled = value; - } - } - /// - /// resetta la selezione dei valori in caso di modifiche su altri controlli - /// - public void resetSelezione() - { - grView.SelectedIndex = -1; - grView.DataBind(); - setDetVisibility(); - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - /// - /// indico cambio selezione valore... - /// - /// - /// - protected void grView_SelectedIndexChanged(object sender, EventArgs e) - { - setDetVisibility(); - if (eh_faseSel != null) - { - eh_faseSel(this, new EventArgs()); - } - } /// /// restituisce una classe css a seconda dei valori passati: /// green: bdgt > real @@ -555,20 +557,51 @@ namespace GPW_Admin.WebUserControls } return "ui-corner-all " + answ; } + /// - /// determina se sia visibile pnl dettaglio RA della fase selezionata + /// determina se sia eliminabile il record (=non usato) /// - public bool enableShowRA + /// + /// + public bool delEnabled(object idxObj) { - get + bool answ = isWritable(); + // solo se ha diritti scrittura controllo + if (idxObj != null) { - return pnlDetRA.Visible; - } - set - { - pnlDetRA.Visible = value; + if (answ) + { + int trovati = 0; + int idxFase = 0; + _ = int.TryParse(idxObj.ToString(), out idxFase); + trovati = DataProxy.DP.taRA.getByFase(idxFase).Count; + // controllo se ci sono record correlati... + if (trovati > 0) + { + answ = false; + } + } } + return answ; } + + /// + /// inverte valore booleano + /// + /// + /// + public bool invBool(object valore) + { + bool answ = true; + try + { + answ = !Convert.ToBoolean(valore); + } + catch + { } + return answ; + } + /// /// calcola se sia ancestore la fase /// @@ -590,6 +623,7 @@ namespace GPW_Admin.WebUserControls } return answ; } + /// /// risponde alla domanda se l'utente abbia permesso tipo writable (S) nel permessi2funzione /// @@ -604,35 +638,58 @@ namespace GPW_Admin.WebUserControls answ = user_std.UtSn.isPageWriteEnabled(_paginaCorrente) && chkLicOk; return answ; } + /// - /// controllo stato licenze! + /// resetta la selezione dei valori in caso di modifiche su altri controlli /// - public bool chkLicOk + public void resetSelezione() { - get + grView.SelectedIndex = -1; + grView.DataBind(); + setDetVisibility(); + if (eh_resetSelezione != null) { - return (licenzeGPW.utentiAttivi < licenzeGPW.licenzeAttive); - } - } - /// - /// check licenze in fase di update... - /// - /// - /// - protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) - { - if (!licenzeGPW.checkLicenze) - { - if (e != null) - { - // annullo insert se licenze sforate... - e.Cancel = true; - grView.EditIndex = -1; - grView.DataBind(); - } + eh_resetSelezione(this, new EventArgs()); } } - #endregion + /// + /// effettua traduzione del lemma + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + /// + /// determina dimensioni dell'oggetto spaziatore data la fase + /// + /// + /// + public Unit widthByCod(object codFase) + { + Unit answ = new Unit(0, UnitType.Pixel); + int livello = 0; + if (codFase != null) + { + // calcolo livello come num punti "." -1... + try + { + string[] array = codFase.ToString().Split('.'); + livello = array.Length; + } + catch + { } + if (livello >= 4) + { + answ = new Unit((livello - 3) * 10, UnitType.Pixel); + } + } + return answ; + } + + #endregion Public Methods } } \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs index e8020a4..492d40c 100644 --- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs @@ -14,6 +14,33 @@ namespace GPW_Admin.WebUserControls public partial class mod_adminFasi { + /// + /// Controllo hfCardStyle. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfCardStyle; + + /// + /// Controllo divCardMain. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCardMain; + + /// + /// Controllo divCardHeader. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCardHeader; + /// /// Controllo divReturn. /// diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx index 42a9fec..74cb601 100644 --- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx +++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx @@ -1,103 +1,100 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_approvaTimbr.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_approvaTimbr" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<% if (false) - { %> - -<% } %> -
-
-
- - + +
+
+ + +
+
+ +
-
-
- - -
-
-
- - - - - - - - Nessun record da approvare - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- - - - -
- - -
- - - - -
- -
- - -
- -
- - - - -
- - -
- - - - - - - - - - - - - - - - -
+
+
+ + + + + + + + Nessun record da approvare + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ +
+ + + + +
+ + +
+ + + + +
+ +
+ + +
+ +
+ + + + +
+ + +
+ + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_reportPrj.ascx b/GPW_Admin/WebUserControls/mod_reportPrj.ascx index ca2681d..bd26831 100644 --- a/GPW_Admin/WebUserControls/mod_reportPrj.ascx +++ b/GPW_Admin/WebUserControls/mod_reportPrj.ascx @@ -4,14 +4,14 @@ <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %> <%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc3" %> <% if (false) - { %> + { %> <% } %> -
+
-
+

@@ -31,4 +31,4 @@ -

+
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_reportPrj.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_reportPrj.ascx.designer.cs index 48da133..e6a22d7 100644 --- a/GPW_Admin/WebUserControls/mod_reportPrj.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_reportPrj.ascx.designer.cs @@ -1,32 +1,34 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace GPW_Admin.WebUserControls { - - - public partial class mod_reportPrj { - +namespace GPW_Admin.WebUserControls +{ + + + public partial class mod_reportPrj + { + /// - /// repReports control. + /// Controllo repReports. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Repeater repReports; - + /// - /// odsReports control. + /// Controllo odsReports. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsReports; } diff --git a/GPW_Admin/approvTimbrature.aspx b/GPW_Admin/approvTimbrature.aspx index 424b4dc..de8c686 100644 --- a/GPW_Admin/approvTimbrature.aspx +++ b/GPW_Admin/approvTimbrature.aspx @@ -1,5 +1,6 @@ -<%@ Page Title="GPW-ADM"Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" CodeBehind="approvTimbrature.aspx.cs" Inherits="GPW_Admin.approvTimbrature" %> -<%@ Register src="~/WebUserControls/mod_approvaTimbr.ascx" tagname="mod_approvaTimbr" tagprefix="uc1" %> +<%@ Page Title="GPW-ADM" Language="C#" MasterPageFile="~/WebMasterPages/BMP.master" AutoEventWireup="true" CodeBehind="approvTimbrature.aspx.cs" Inherits="GPW_Admin.approvTimbrature" %> + +<%@ Register Src="~/WebUserControls/mod_approvaTimbr.ascx" TagName="mod_approvaTimbr" TagPrefix="uc1" %> - + \ No newline at end of file diff --git a/GPW_Admin/dipendenti.aspx b/GPW_Admin/dipendenti.aspx index fefec91..c9c3c54 100644 --- a/GPW_Admin/dipendenti.aspx +++ b/GPW_Admin/dipendenti.aspx @@ -1,5 +1,6 @@ -<%@ Page Title="GPW-ADM"Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" CodeBehind="dipendenti.aspx.cs" Inherits="GPW_Admin.dipendenti" %> -<%@ Register src="~/WebUserControls/mod_adminDipendenti.ascx" tagname="mod_adminDipendenti" tagprefix="uc1" %> +<%@ Page Title="GPW-ADM" Language="C#" MasterPageFile="~/WebMasterPages/BMP.master" AutoEventWireup="true" CodeBehind="dipendenti.aspx.cs" Inherits="GPW_Admin.dipendenti" %> + +<%@ Register Src="~/WebUserControls/mod_adminDipendenti.ascx" TagName="mod_adminDipendenti" TagPrefix="uc1" %> - + \ No newline at end of file diff --git a/GPW_Admin/dipendenti.aspx.designer.cs b/GPW_Admin/dipendenti.aspx.designer.cs index bfa8ab1..0bb58ab 100644 --- a/GPW_Admin/dipendenti.aspx.designer.cs +++ b/GPW_Admin/dipendenti.aspx.designer.cs @@ -1,23 +1,25 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace GPW_Admin { - - - public partial class dipendenti { - +namespace GPW_Admin +{ + + + public partial class dipendenti + { + /// - /// mod_adminDipendenti1 control. + /// Controllo mod_adminDipendenti1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::GPW_Admin.WebUserControls.mod_adminDipendenti mod_adminDipendenti1; } diff --git a/GPW_Admin/fasi.aspx b/GPW_Admin/fasi.aspx index b321668..dfe057e 100644 --- a/GPW_Admin/fasi.aspx +++ b/GPW_Admin/fasi.aspx @@ -2,5 +2,5 @@ <%@ Register Src="~/WebUserControls/mod_adminFasi.ascx" TagName="mod_adminFasi" TagPrefix="uc1" %> - - + + \ No newline at end of file diff --git a/GPW_Admin/gestCalendario.aspx b/GPW_Admin/gestCalendario.aspx index 9a0c18c..dce7045 100644 --- a/GPW_Admin/gestCalendario.aspx +++ b/GPW_Admin/gestCalendario.aspx @@ -1,7 +1,7 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" CodeBehind="gestCalendario.aspx.cs" Inherits="GPW_Admin.gestCalendario" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/BMP.master" AutoEventWireup="true" CodeBehind="gestCalendario.aspx.cs" Inherits="GPW_Admin.gestCalendario" %> <%@ Register Src="~/WebUserControls/mod_gestCalendario.ascx" TagPrefix="uc1" TagName="mod_gestCalendario" %> - - + + \ No newline at end of file diff --git a/GPW_Admin/images/LogoSteamware.png b/GPW_Admin/images/LogoSteamware.png new file mode 100644 index 0000000..012685c Binary files /dev/null and b/GPW_Admin/images/LogoSteamware.png differ diff --git a/GPW_Admin/menu.aspx b/GPW_Admin/menu.aspx index a8bbd06..431b532 100644 --- a/GPW_Admin/menu.aspx +++ b/GPW_Admin/menu.aspx @@ -1,7 +1,20 @@ -<%@ Page Title="GPW-ADM"Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" CodeBehind="menu.aspx.cs" +<%@ Page Title="GPW-ADM" Language="C#" MasterPageFile="~/WebMasterPages/BMP.master" AutoEventWireup="true" CodeBehind="menu.aspx.cs" Inherits="GPW_Admin.menu" %> +<%@ Register Src="~/WebUserControls/cmp_homeButtons.ascx" TagPrefix="uc1" TagName="cmp_homeButtons" %> + -