From aba50c33dca6a0d15cf1228daeb259aad6d063c0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 15 Sep 2017 11:45:07 +0200
Subject: [PATCH] Fix master + pagina allegati x upload...

---
 ScheMe-SP/Allegati.aspx                       | 22 +++++++++++++++
 .../{Attivita.aspx.cs => Allegati.aspx.cs}    |  2 +-
 ScheMe-SP/Allegati.aspx.designer.cs           | 24 +++++++++++++++++
 ScheMe-SP/Attivita.aspx                       |  9 -------
 ScheMe-SP/Attivita.aspx.designer.cs           | 24 -----------------
 ScheMe-SP/Bootstrap.Master                    |  5 +++-
 ScheMe-SP/Bootstrap.Master.designer.cs        |  9 +++++++
 ScheMe-SP/Prova.aspx                          |  6 +++++
 ScheMe-SP/Prova.aspx.designer.cs              | 27 ++++++++++++-------
 9 files changed, 83 insertions(+), 45 deletions(-)
 create mode 100644 ScheMe-SP/Allegati.aspx
 rename ScheMe-SP/{Attivita.aspx.cs => Allegati.aspx.cs} (82%)
 create mode 100644 ScheMe-SP/Allegati.aspx.designer.cs
 delete mode 100644 ScheMe-SP/Attivita.aspx
 delete mode 100644 ScheMe-SP/Attivita.aspx.designer.cs

diff --git a/ScheMe-SP/Allegati.aspx b/ScheMe-SP/Allegati.aspx
new file mode 100644
index 0000000..9f16854
--- /dev/null
+++ b/ScheMe-SP/Allegati.aspx
@@ -0,0 +1,22 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Allegati.aspx.cs" Inherits="ScheMe.Allegati" %>
+
+<%@ Register Src="WebUserControls/mod_fileUpload.ascx" TagName="mod_fileUpload" TagPrefix="uc1" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="NoAjaxContent" runat="server">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <div class="row" style="margin-bottom: 0.5em;">
+        <div class="col-xs-12">
+          <b>Allegati Paziente</b>
+        </div>
+      </div>
+    </div>
+    <div class="panel-body">
+      <uc1:mod_fileUpload ID="mod_fileUpload1" runat="server" />
+    </div>
+  </div>
+</asp:Content>
diff --git a/ScheMe-SP/Attivita.aspx.cs b/ScheMe-SP/Allegati.aspx.cs
similarity index 82%
rename from ScheMe-SP/Attivita.aspx.cs
rename to ScheMe-SP/Allegati.aspx.cs
index d2a1b53..b22dd7a 100644
--- a/ScheMe-SP/Attivita.aspx.cs
+++ b/ScheMe-SP/Allegati.aspx.cs
@@ -7,7 +7,7 @@ using System.Web.UI.WebControls;
 
 namespace ScheMe
 {
-    public partial class Attivita : System.Web.UI.Page
+    public partial class Allegati : System.Web.UI.Page
     {
         protected void Page_Load(object sender, EventArgs e)
         {
diff --git a/ScheMe-SP/Allegati.aspx.designer.cs b/ScheMe-SP/Allegati.aspx.designer.cs
new file mode 100644
index 0000000..a041027
--- /dev/null
+++ b/ScheMe-SP/Allegati.aspx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace ScheMe {
+    
+    
+    public partial class Allegati {
+        
+        /// <summary>
+        /// Controllo mod_fileUpload1.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::ScheMe.WebUserControls.mod_fileUpload mod_fileUpload1;
+    }
+}
diff --git a/ScheMe-SP/Attivita.aspx b/ScheMe-SP/Attivita.aspx
deleted file mode 100644
index c2b69ac..0000000
--- a/ScheMe-SP/Attivita.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Attivita.aspx.cs" Inherits="ScheMe.Attivita" %>
-
-<%@ Register Src="WebUserControls/mod_fileUpload.ascx" TagName="mod_fileUpload" TagPrefix="uc1" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
-</asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <uc1:mod_fileUpload ID="mod_fileUpload1" runat="server" />
-</asp:Content>
diff --git a/ScheMe-SP/Attivita.aspx.designer.cs b/ScheMe-SP/Attivita.aspx.designer.cs
deleted file mode 100644
index f75e070..0000000
--- a/ScheMe-SP/Attivita.aspx.designer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ScheMe {
-    
-    
-    public partial class Attivita {
-        
-        /// <summary>
-        /// mod_fileUpload1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ScheMe.WebUserControls.mod_fileUpload mod_fileUpload1;
-    }
-}
diff --git a/ScheMe-SP/Bootstrap.Master b/ScheMe-SP/Bootstrap.Master
index eb34e26..b506955 100644
--- a/ScheMe-SP/Bootstrap.Master
+++ b/ScheMe-SP/Bootstrap.Master
@@ -18,6 +18,7 @@
     <%: Scripts.Render("~/bundles/jquery") %>
     <%: Scripts.Render("~/bundles/jqueryui") %>
     <%: Scripts.Render("~/bundles/bootSwitch") %>
+    <%--<%: Scripts.Render("~/bundles/bootstrap-file-input") %>--%>
   </asp:PlaceHolder>
 
   <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap/css" />
@@ -61,9 +62,11 @@
             </asp:ContentPlaceHolder>
           </ContentTemplate>
         </asp:UpdatePanel>
+        <asp:ContentPlaceHolder ID="NoAjaxContent" runat="server">
+        </asp:ContentPlaceHolder>
         <asp:UpdatePanel ID="uppFooter" runat="server">
           <ContentTemplate>
-              <uc1:mod_bottom runat="server" ID="mod_bottom" />
+            <uc1:mod_bottom runat="server" ID="mod_bottom" />
           </ContentTemplate>
         </asp:UpdatePanel>
       </div>
diff --git a/ScheMe-SP/Bootstrap.Master.designer.cs b/ScheMe-SP/Bootstrap.Master.designer.cs
index 647c72c..97a7aeb 100644
--- a/ScheMe-SP/Bootstrap.Master.designer.cs
+++ b/ScheMe-SP/Bootstrap.Master.designer.cs
@@ -84,6 +84,15 @@ namespace ScheMe {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
         
+        /// <summary>
+        /// Controllo NoAjaxContent.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ContentPlaceHolder NoAjaxContent;
+        
         /// <summary>
         /// Controllo uppFooter.
         /// </summary>
diff --git a/ScheMe-SP/Prova.aspx b/ScheMe-SP/Prova.aspx
index 1ae74c6..bce2a88 100644
--- a/ScheMe-SP/Prova.aspx
+++ b/ScheMe-SP/Prova.aspx
@@ -1,5 +1,11 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Prova.aspx.cs" Inherits="ScheMe.Prova" %>
+
+<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 </asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="NoAjaxContent" runat="server">
+  <uc1:mod_fileUpload runat="server" ID="mod_fileUpload" />
+</asp:Content>
diff --git a/ScheMe-SP/Prova.aspx.designer.cs b/ScheMe-SP/Prova.aspx.designer.cs
index b020c34..002b8cf 100644
--- a/ScheMe-SP/Prova.aspx.designer.cs
+++ b/ScheMe-SP/Prova.aspx.designer.cs
@@ -1,17 +1,24 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <generato automaticamente>
 //     Codice generato da uno strumento.
 //
 //     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato.
-// </auto-generated>
+//     il codice viene rigenerato. 
+// </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace ScheMe
-{
-
-
-  public partial class Prova
-  {
-  }
+namespace ScheMe {
+    
+    
+    public partial class Prova {
+        
+        /// <summary>
+        /// Controllo mod_fileUpload.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::ScheMe.WebUserControls.mod_fileUpload mod_fileUpload;
+    }
 }