From 2e3dca931a40ea4749c454500a62a618945c79ec Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 Jul 2017 10:19:19 +0200 Subject: [PATCH] fix grafici... --- PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master | 221 +++++++++--------- .../WebUserControls/mod_datiComm.ascx | 4 +- .../mod_datiComm.ascx.designer.cs | 46 ++-- .../WebUserControls/mod_filtroComm.ascx | 50 ++-- .../mod_filtroComm.ascx.designer.cs | 64 ++--- .../WebUserControls/mod_menuProj.ascx | 13 +- .../PROJ-ETS/WebUserControls/mod_testata.ascx | 70 +++--- PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll | Bin 126464 -> 126464 bytes 8 files changed, 240 insertions(+), 228 deletions(-) diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master index 4a289b1..f9886ad 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master @@ -9,121 +9,124 @@ - - <%: Page.Title %> - PROJ-ETS - - <%: Scripts.Render("~/bundles/modernizr") %> - - + + <%: Page.Title %> - PROJ-ETS + + <%: Scripts.Render("~/bundles/modernizr") %> + + - - - - + + + + -
- - - <%--Framework Scripts--%> - - - - - - - - - - - - - <%--Site Scripts--%> - - - - + - <%--testata pagina--%> -
- -
- <%--corpo pagina--%> -
- -
- - - - - - -
+ // oggetto da legare all'update parziale ajax x sistemare btns & co + var prm = Sys.WebForms.PageRequestManager.getInstance(); + prm.add_endRequest(function () { + // re-bind your jQuery events here + $(function () { + $("#tabs").tabs({ + //collapsible: true + //heightStyle: "fill" + }); + $.datepicker.setDefaults($.datepicker.regional["it"]); + $(".datepicker").datepicker({ + //showOtherMonths: true, + //selectOtherMonths: true, + showButtonPanel: true, + changeMonth: true, + changeYear: true, + dateFormat: "dd-mm-yy" + }); + }); + $(function () { + $("#dialog-modal").dialog({ + //height: 140, + autoOpen: false, + //modal: true + }); + }); + $(".openDiag").click(function () { + var dlg = $("#dialog-modal").dialog("open"); + dlg.parent().appendTo(jQuery("form:first")); + }); + }); + + <%--testata pagina--%> +
+ +
+ <%--corpo pagina--%> +
+ +
+
+
+ + + + + +
- <%--footer pagina--%> -
- -
+
+
+ <%--footer pagina--%> +
+ +
- + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx index 5a29948..819d0e5 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -7,7 +7,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs index bd1f0d7..a5b98c3 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.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 PROJ_ETS.WebUserControls { @@ -13,56 +13,56 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_datiComm { /// - /// frmView control. + /// Controllo frmView. /// /// - /// 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.FormView frmView; /// - /// ods control. + /// Controllo ods. /// /// - /// 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 ods; /// - /// mod_navDettComm1 control. + /// Controllo mod_navDettComm1. /// /// - /// 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::PROJ_ETS.WebUserControls.mod_navDettComm mod_navDettComm1; /// - /// btnEmailCC control. + /// Controllo btnEmailCC. /// /// - /// 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.Button btnEmailCC; /// - /// lblEmailCC control. + /// Controllo lblEmailCC. /// /// - /// 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 lblEmailCC; /// - /// odsCC control. + /// Controllo odsCC. /// /// - /// 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 odsCC; } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx index 447e988..0114cb5 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx @@ -1,33 +1,35 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroComm.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_filtroComm" %> <%@ Register Src="mod_autocomplete.ascx" TagName="mod_autocomplete" TagPrefix="uc1" %> -
+
+
-
- -
+
+ +
-
- +
+
-
- - - - - - - - +
+ + + + + + + +
-
- - - - - - - +
+ + + + + + +
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs index 5756b39..001bb03 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.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 PROJ_ETS.WebUserControls { @@ -13,83 +13,83 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_filtroComm { /// - /// pnlCli control. + /// Controllo pnlCli. /// /// - /// 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 pnlCli; /// - /// filtroCli control. + /// Controllo filtroCli. /// /// - /// 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::PROJ_ETS.WebUserControls.mod_autocomplete filtroCli; /// - /// chkShowAttivi control. + /// Controllo chkShowAttivi. /// /// - /// 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.CheckBox chkShowAttivi; /// - /// lblProj control. + /// Controllo lblProj. /// /// - /// 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 lblProj; /// - /// ddlProgetti control. + /// Controllo ddlProgetti. /// /// - /// 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.DropDownList ddlProgetti; /// - /// OdsProgetti control. + /// Controllo OdsProgetti. /// /// - /// 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 OdsProgetti; /// - /// lblComm control. + /// Controllo lblComm. /// /// - /// 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 lblComm; /// - /// ddlCommesse control. + /// Controllo ddlCommesse. /// /// - /// 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.DropDownList ddlCommesse; /// - /// OdsCommesse control. + /// Controllo OdsCommesse. /// /// - /// 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 OdsCommesse; } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx index 90efc7b..1477fc2 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx @@ -1,5 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuProj.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_menuProj" %> - - - - + +
+
+ + + + +
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx index ce21d3b..146fef6 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx @@ -1,47 +1,49 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_testata" %>
+
- -
- + +
+
- - - - -
-
-
-     -
- - - - + + + + +
+
+
+     +
+ + + +
-
-

- - - -

+

+ + + +

+
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index d30fcedd8d4f0ff508344a1228b52c97d53d97ae..c4b2cab9476161ece8b456b5cb9a4fec7438362b 100644 GIT binary patch delta 74 zcmZp;!`^U*eL@Gb{m-(-?ycR7ycY$2E?-wA5V*yCf#0zeH;!aWY+rGaQA8M|V*36k ejFJM(>;n7r?DD6 eQBvSS&Q59F`%2C$&rE(D*1N%J`->-x5}W|R$sp?h