diff --git a/GPW_Commesse/Bundle.config b/GPW_Commesse/Bundle.config index 2ac8810..d6b74b7 100644 --- a/GPW_Commesse/Bundle.config +++ b/GPW_Commesse/Bundle.config @@ -1,8 +1,9 @@  - + + diff --git a/GPW_Commesse/Content/MasterPage.css b/GPW_Commesse/Content/MasterPage.css index 6570fb4..f0c0f73 100644 --- a/GPW_Commesse/Content/MasterPage.css +++ b/GPW_Commesse/Content/MasterPage.css @@ -4,9 +4,6 @@ padding: 0; border: 0; outline: 0; - font-weight: inherit; - font-style: inherit; - font-family: Verdana, Arial; vertical-align: baseline; } /* remember to define focus styles! */ @@ -44,21 +41,6 @@ blockquote, q } -.fullscreen -{ - display: block; /*set the div in the top-left corner of the screen*/ /*position: absolute;*/ /* COMMENTATA per iExplorer */ - top: 0; - left: 0; /*set the width and height to 100% of the screen*/ - width: 100%; - height: 100%; -} -.bottomWrite -{ - vertical-align: bottom; - border-top: #0D0083 1px solid; - margin-top: 2px; - padding-top: 2px; -} .smallText { font-size: 8pt; @@ -90,12 +72,6 @@ blockquote, q height: 20pt; text-align: center; } -.formatTableGeneral -{ - height: 100%; - width: 100%; - border-bottom-width: 0px; -} .dxButtonClass { padding-right: 8px; diff --git a/GPW_Commesse/Content/Site.css b/GPW_Commesse/Content/Site.css deleted file mode 100644 index 7ad4654..0000000 --- a/GPW_Commesse/Content/Site.css +++ /dev/null @@ -1,40 +0,0 @@ -/* Move down content because we have a fixed navbar that is 50px tall */ -body { - padding-top: 50px; - padding-bottom: 20px; -} -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} -/* Responsive: Portrait tablets and up */ -@media screen and (min-width: 768px) { - .jumbotron { - margin-top: 20px; - } - .body-content { - padding: 0; - } - /* Set widths on the form inputs since otherwise they're 100% wide */ - input, - select, - textarea { - max-width: 100%; - } -} -.elTimbSmart { - padding: 0.2em; - font-size: 1.1em; - line-height: 1.3em; -} -.ui-input-btn input { - opacity: .5; -} \ No newline at end of file diff --git a/GPW_Commesse/Content/Site.less b/GPW_Commesse/Content/Site.less deleted file mode 100644 index 67a625c..0000000 --- a/GPW_Commesse/Content/Site.less +++ /dev/null @@ -1,50 +0,0 @@ -/* Move down content because we have a fixed navbar that is 50px tall */ -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} - - -/* Responsive: Portrait tablets and up */ -@media screen and (min-width: 768px) { - .jumbotron { - margin-top: 20px; - } - - .body-content { - padding: 0; - } - - /* Set widths on the form inputs since otherwise they're 100% wide */ - input, - select, - textarea { - max-width: 100%; - } - -} - - -.elTimbSmart{ - padding: 0.2em; - font-size: 1.1em; - line-height: 1.3em; -} - -.ui-input-btn input { - opacity: .5; -} \ No newline at end of file diff --git a/GPW_Commesse/Content/Site.min.css b/GPW_Commesse/Content/Site.min.css deleted file mode 100644 index f98214b..0000000 --- a/GPW_Commesse/Content/Site.min.css +++ /dev/null @@ -1 +0,0 @@ -body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}@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;} \ No newline at end of file diff --git a/GPW_Commesse/Content/Style.css b/GPW_Commesse/Content/Style.css index 88c91c6..d8d7300 100644 --- a/GPW_Commesse/Content/Style.css +++ b/GPW_Commesse/Content/Style.css @@ -3,6 +3,48 @@ @import url('ExtraComp.css'); @import url('BtnReport.css'); @import url('JQClock.css'); +/* Move down content because we have a fixed navbar that is 50px tall */ +body { + /*font-family: 'Open Sans Condensed', sans-serif;*/ + font-family: 'Roboto Condensed', sans-serif; + padding-top: 50px; + padding-bottom: 20px; +} +/* Wrapping element */ +/* Set some basic padding to keep content from hitting the edges */ +.body-content { + padding-left: 15px; + padding-right: 15px; +} +/* Set widths on the form inputs since otherwise they're 100% wide */ +input, +select, +textarea { + max-width: 280px; +} +/* Responsive: Portrait tablets and up */ +@media screen and (min-width: 768px) { + .jumbotron { + margin-top: 20px; + } + .body-content { + padding: 0; + } + /* Set widths on the form inputs since otherwise they're 100% wide */ + input, + select, + textarea { + max-width: 100%; + } +} +.elTimbSmart { + padding: 0.2em; + font-size: 1.1em; + line-height: 1.3em; +} +.ui-input-btn input { + opacity: 0.5; +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -16,12 +58,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 +72,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_Commesse/Content/Style.less b/GPW_Commesse/Content/Style.less index 24c7a19..b94e052 100644 --- a/GPW_Commesse/Content/Style.less +++ b/GPW_Commesse/Content/Style.less @@ -4,6 +4,59 @@ @import url('../Content/BtnReport.css'); @import url('../Content/JQClock.css'); +/* Move down content because we have a fixed navbar that is 50px tall */ +body { + /*font-family: 'Open Sans Condensed', sans-serif;*/ + font-family: 'Roboto Condensed', sans-serif; + padding-top: 50px; + padding-bottom: 20px; +} + +/* Wrapping element */ +/* Set some basic padding to keep content from hitting the edges */ +.body-content { + padding-left: 15px; + padding-right: 15px; +} + +/* Set widths on the form inputs since otherwise they're 100% wide */ +input, +select, +textarea { + max-width: 280px; +} + + +/* Responsive: Portrait tablets and up */ +@media screen and (min-width: 768px) { + .jumbotron { + margin-top: 20px; + } + + .body-content { + padding: 0; + } + + /* Set widths on the form inputs since otherwise they're 100% wide */ + input, + select, + textarea { + max-width: 100%; + } +} + + +.elTimbSmart { + padding: 0.2em; + font-size: 1.1em; + line-height: 1.3em; +} + +.ui-input-btn input { + opacity: .5; +} + + * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -46,19 +99,6 @@ vertical-align:middle; background-repeat: no-repeat; } - -.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;*/ - text-align: center; - height: 100%; - width: 100%; - background-position: center; - background-attachment: scroll; - background-repeat: no-repeat; -} .bodyCenter { vertical-align: middle; @@ -79,57 +119,3 @@ A:hover color: red; } -.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;*/ - height: 100%; - width: 100%; - background-position: center; /*was topleft*/ - background-attachment: scroll; - background-repeat: no-repeat; -} -.bodyMainEmpty -{ - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; -} - -.bodyMainWhite -{ - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; - background-position: center; - background-attachment: scroll; - background-repeat: no-repeat; -} - -.bodyMainWhite a:hover -{ - color: white; -} - -.bodyMainNoLogo -{ - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; -} - -.bodyMainLogoPiccolo -{ - background-image: url(../images/sfondoMedio.png); - background-position: 97% 210px; - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; - background-attachment: scroll; - background-repeat: no-repeat; -} diff --git a/GPW_Commesse/Content/Style.min.css b/GPW_Commesse/Content/Style.min.css index e163213..657576a 100644 --- a/GPW_Commesse/Content/Style.min.css +++ b/GPW_Commesse/Content/Style.min.css @@ -1 +1 @@ -@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.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;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyMainCenter{vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}.bodyMain{vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainEmpty{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainWhite{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat;}.bodyMainWhite a:hover{color:#fff;}.bodyMainNoLogo{vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;}.bodyMainLogoPiccolo{background-image:url(../images/sfondoMedio.png);background-position:97% 210px;vertical-align:top;border-left:#800000 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat;} \ No newline at end of file +@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}@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;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.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;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;} \ No newline at end of file diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index f8461a9..9c0a38a 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -167,12 +167,6 @@ - - Site.less - - - Site.css - Style.less @@ -275,6 +269,11 @@ + + + + + @@ -282,6 +281,7 @@ + @@ -303,7 +303,6 @@ - @@ -381,8 +380,6 @@ Web.config - - Web.config @@ -436,12 +433,8 @@ AjaxSimpleFull.Master ASPXCodeBehind - - AjaxTitle.master - ASPXCodeBehind - - - AjaxTitle.master + + AjaxSimpleFull.Master mod_autocomplete.ascx diff --git a/GPW_Commesse/WebMasterPages/AjaxSimple.master b/GPW_Commesse/WebMasterPages/AjaxSimple.master index 48f370b..36e0290 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimple.master +++ b/GPW_Commesse/WebMasterPages/AjaxSimple.master @@ -5,48 +5,36 @@ - - - - <%: Page.Title %> - GPW - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - + + + + <%: Page.Title %> - GPW + + <%: Scripts.Render("~/bundles/modernizr") %> + - - - + + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + + + + + <%--DA VERIFICARE QUESTI in inclusione...--%> + + -
- <%-- - --%> + -
- - - - - - - -
-
- - -
-
- -
+
+
+ + +
+
- + diff --git a/GPW_Commesse/WebMasterPages/AjaxSimple.master.designer.cs b/GPW_Commesse/WebMasterPages/AjaxSimple.master.designer.cs index 6d57369..80b60ca 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimple.master.designer.cs +++ b/GPW_Commesse/WebMasterPages/AjaxSimple.master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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. +// //------------------------------------------------------------------------------ @@ -12,65 +12,65 @@ public partial class AjaxSimple { /// - /// Head1 control. + /// Controllo Head1. /// /// - /// 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.HtmlControls.HtmlHead Head1; /// - /// BundleReference2 control. + /// Controllo BundleReference2. /// /// - /// 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// BundleReference1 control. + /// Controllo BundleReference1. /// /// - /// 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// form1 control. + /// Controllo form1. /// /// - /// 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.HtmlControls.HtmlForm form1; /// - /// ScriptManager1 control. + /// Controllo ScriptManager1. /// /// - /// 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.ScriptManager ScriptManager1; /// - /// cph1 control. + /// Controllo cph1. /// /// - /// 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.ContentPlaceHolder cph1; /// - /// Mod_menuBottom1 control. + /// Controllo Mod_menuBottom1. /// /// - /// 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::mod_menuBottom Mod_menuBottom1; } diff --git a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master index 493924a..12b1ab5 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master @@ -5,77 +5,74 @@ - - - - <%: Page.Title %> - GPW - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - + + + + <%: Page.Title %> - GPW + + <%: Scripts.Render("~/bundles/modernizr") %> + - - - + + - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%> - + + + + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + - <%--DA VERIFICARE QUESTI in inclusione...--%> - - + - + }); + }); + -
- - -
- -
- - - - - - -
-
- - - - - -
+ + + +
+
+
+ + + + + +
- +
+
+ + + + + +
+
+ diff --git a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master.designer.cs b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master.designer.cs index 541b6ea..3d6e8a7 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master.designer.cs +++ b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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.WebMasterPages { @@ -13,93 +13,93 @@ namespace GPW.WebMasterPages { public partial class AjaxSimpleFull { /// - /// Head1 control. + /// Controllo Head1. /// /// - /// 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.HtmlControls.HtmlHead Head1; /// - /// BundleReference2 control. + /// Controllo BundleReference2. /// /// - /// 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// BundleReference1 control. + /// Controllo BundleReference1. /// /// - /// 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// PlaceHolder1 control. + /// Controllo PlaceHolder1. /// /// - /// 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.PlaceHolder PlaceHolder1; /// - /// form1 control. + /// Controllo form1. /// /// - /// 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.HtmlControls.HtmlForm form1; /// - /// sm control. + /// Controllo sm. /// /// - /// 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.ScriptManager sm; /// - /// upMain control. + /// Controllo upMain. /// /// - /// 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.UpdatePanel upMain; /// - /// cph1 control. + /// Controllo cph1. /// /// - /// 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.ContentPlaceHolder cph1; /// - /// upBott control. + /// Controllo upBott. /// /// - /// 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.UpdatePanel upBott; /// - /// mod_menuBottomFullpage1 control. + /// Controllo mod_menuBottomFullpage. /// /// - /// 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.WebUserControls.mod_menuBottomFullpage mod_menuBottomFullpage1; + protected global::GPW_Commesse.WebUserControls.mod_menuBottomFullpage mod_menuBottomFullpage; } } diff --git a/GPW_Commesse/WebMasterPages/AjaxTitle.master b/GPW_Commesse/WebMasterPages/AjaxTitle.master deleted file mode 100644 index f1e0c56..0000000 --- a/GPW_Commesse/WebMasterPages/AjaxTitle.master +++ /dev/null @@ -1,128 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="True" Inherits="AjaxTitle" CodeBehind="AjaxTitle.master.cs" %> - -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> -<%@ Register Src="~/WebUserControls/mod_pageTitleAndSearch.ascx" TagName="mod_pageTitleAndSearch" TagPrefix="uc3" %> -<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %> -<%@ Register Src="~/WebUserControls/mod_pageSize.ascx" TagName="mod_pageSize" TagPrefix="uc6" %> - - - - - - - - <%: Page.Title %> - GPW - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - - - - - - - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%> - - - - <%--DA VERIFICARE QUESTI in inclusione...--%> - - - - - - -
- <%-- - --%> - <%-- - --%> - - -
- - - - - - - - - - - -
-
- - - - - -
-
- - - - - - -
- - -
- - - - - - - - -
- - -
- -
-
- - -
-
- - -
-
- -
-
-
- - diff --git a/GPW_Commesse/WebMasterPages/AjaxTitle.master.cs b/GPW_Commesse/WebMasterPages/AjaxTitle.master.cs deleted file mode 100644 index ef61e67..0000000 --- a/GPW_Commesse/WebMasterPages/AjaxTitle.master.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -using System.Collections; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; -using SteamWare; - -public partial class AjaxTitle : System.Web.UI.MasterPage -{ - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); - } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); - Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); - } - - void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) - { - // chiamo update del menu sx... - Mod_menuSx1.forzaUpdateMenu(); - } - - void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) - { - // cambio stato visualizzaizone menù laterale... - Mod_menuSx1.Visible = !Mod_menuSx1.Visible; - } - - protected override void OnUnload(EventArgs e) - { - base.OnUnload(e); - // svuoto tutti gli event handler inseriti... - Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); - Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); - - } -} diff --git a/GPW_Commesse/WebMasterPages/AjaxTitle.master.designer.cs b/GPW_Commesse/WebMasterPages/AjaxTitle.master.designer.cs deleted file mode 100644 index 52d21b0..0000000 --- a/GPW_Commesse/WebMasterPages/AjaxTitle.master.designer.cs +++ /dev/null @@ -1,148 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - - -public partial class AjaxTitle { - - /// - /// Head1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - - /// - /// BundleReference2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - - /// - /// BundleReference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - - /// - /// PlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// sm control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.ScriptManager sm; - - /// - /// upTop control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel upTop; - - /// - /// Mod_menuTop1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuTop Mod_menuTop1; - - /// - /// upSx control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel upSx; - - /// - /// Mod_menuSx1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuSx Mod_menuSx1; - - /// - /// upMain control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel upMain; - - /// - /// Mod_pageTitleAndSearch1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; - - /// - /// mod_pageSize1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GPW_Commesse.WebUserControls.mod_pageSize mod_pageSize1; - - /// - /// cph1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder cph1; - - /// - /// Mod_menuBottom1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuBottom Mod_menuBottom1; -} diff --git a/GPW_Commesse/WebUserControls/mod_menuBottom.ascx b/GPW_Commesse/WebUserControls/mod_menuBottom.ascx index f29d1d7..555d7cd 100644 --- a/GPW_Commesse/WebUserControls/mod_menuBottom.ascx +++ b/GPW_Commesse/WebUserControls/mod_menuBottom.ascx @@ -1,24 +1,27 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuBottom" CodeBehind="mod_menuBottom.ascx.cs" %> <% if (false) - { %> + { %> <% } %> - + + diff --git a/GPW_Commesse/WebUserControls/mod_menuBottom.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_menuBottom.ascx.designer.cs index 8bf7e10..df6a40d 100644 --- a/GPW_Commesse/WebUserControls/mod_menuBottom.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_menuBottom.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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. +// //------------------------------------------------------------------------------ @@ -12,74 +12,74 @@ public partial class mod_menuBottom { /// - /// pnlCheck control. + /// Controllo pnlCheck. /// /// - /// 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.Panel pnlCheck; /// - /// lblDateTime control. + /// Controllo lblDateTime. /// /// - /// 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.Label lblDateTime; /// - /// lblInfo control. + /// Controllo lblInfo. /// /// - /// 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.Label lblInfo; /// - /// hlInfo control. + /// Controllo hlInfo. /// /// - /// 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.HyperLink hlInfo; /// - /// lblApp control. + /// Controllo lblApp. /// /// - /// 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.Label lblApp; /// - /// lblrev control. + /// Controllo lblrev. /// /// - /// 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.Label lblrev; /// - /// lblCopyRight control. + /// Controllo lblCopyRight. /// /// - /// 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.Label lblCopyRight; /// - /// lblWarning control. + /// Controllo lblWarning. /// /// - /// 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.Label lblWarning; } diff --git a/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx b/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx index dc5fdb8..2b13693 100644 --- a/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx +++ b/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx @@ -1,26 +1,28 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuBottomFullpage.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_menuBottomFullpage" %> <% if (false) - { %> + { %> <% } %> - + diff --git a/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs index 91bf840..395211c 100644 --- a/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Commesse.WebUserControls { @@ -13,83 +13,83 @@ namespace GPW_Commesse.WebUserControls { public partial class mod_menuBottomFullpage { /// - /// pnlCheck control. + /// Controllo pnlCheck. /// /// - /// 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.Panel pnlCheck; /// - /// lblDateTime control. + /// Controllo lblDateTime. /// /// - /// 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.Label lblDateTime; /// - /// lblInfo control. + /// Controllo lblInfo. /// /// - /// 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.Label lblInfo; /// - /// hlInfo control. + /// Controllo hlInfo. /// /// - /// 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.HyperLink hlInfo; /// - /// lblApp control. + /// Controllo lblApp. /// /// - /// 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.Label lblApp; /// - /// lblrev control. + /// Controllo lblrev. /// /// - /// 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.Label lblrev; /// - /// lblCopyRight control. + /// Controllo lblCopyRight. /// /// - /// 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.Label lblCopyRight; /// - /// lblWarning control. + /// Controllo lblWarning. /// /// - /// 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.Label lblWarning; /// - /// Timer1 control. + /// Controllo Timer1. /// /// - /// 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.Timer Timer1; }