completato fix master x sezione A1!!!

2016-11-09 18:09:12 +01:00
parent 39bfe7b231
commit 483ea7a565
5 changed files with 102 additions and 20 deletions
@@ -2,14 +2,27 @@

 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="../WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc1" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Simplepage</title>
-    <link href="../css/Style.css" rel="stylesheet" type="text/css" />
-    <link rel="icon" href="~/images/favicon.png" type="image/png" />
+
+<!DOCTYPE html>
+<html lang="it">
+<head id="Head1" runat="server"> 
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title><%: Page.Title %> - GPW</title>
+    <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+    </asp:PlaceHolder>
+
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
+
    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link rel="icon" href="~/images/favicon.png" type="image/png" />
    <link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
+
+    <%--DA VERIFICARE QUESTI in inclusione...--%>
+    <link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
+    <link href="../Content/StyleCustom.css" rel="stylesheet" type="text/css" />
 </head>
 <body class="body">
    <form id="form1" runat="server">
@@ -11,6 +11,33 @@

 public partial class AjaxSimple {
    
+    /// <summary>
+    /// Head1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+    
+    /// <summary>
+    /// BundleReference1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+    
+    /// <summary>
+    /// BundleReference2 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+    
    /// <summary>
    /// form1 control.
    /// </summary>
@@ -4,7 +4,6 @@
 <%@ Register Src="../WebUserControls/mod_menuBottomFullpage.ascx" TagName="mod_menuBottomFullpage" TagPrefix="uc1" %>

 <!DOCTYPE html>
-
 <html lang="it">
 <head id="Head1" runat="server"> 
    <meta charset="utf-8" />
@@ -6,21 +6,37 @@
 <%@ 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" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>GPW</title>
-    <link href="../css/Style.css" rel="stylesheet" type="text/css" />
-    <link rel="icon" href="~/images/favicon.png" type="image/png" />
+
+
+<!DOCTYPE html>
+<html lang="it">
+<head id="Head1" runat="server"> 
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title><%: Page.Title %> - GPW</title>
+    <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+    </asp:PlaceHolder>
+
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
+
    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link rel="icon" href="~/images/favicon.png" type="image/png" />
    <link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
-    <%--link CDN--%>
-    <%--<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-3.1.1.min.js"></script>
-    <script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.9.0/jquery-ui.min.js"></script>--%>
-    <%--link librerie locali--%>
-    <script src="../Scripts/jquery-3.1.1.min.js" type="text/javascript"></script>
-    <script src="../Scripts/jquery-ui-1.12.1.min.js" type="text/javascript"></script>
-    <link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.12.1.custom.min.css" rel="stylesheet" type="text/css" />
+
+    <asp:PlaceHolder ID="PlaceHolder1" runat="server">
+        <%: Scripts.Render("~/bundles/jquery") %>
+        <%: Scripts.Render("~/bundles/jqueryui") %>
+        <%: Scripts.Render("~/bundles/jSteamware") %>
+        <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%>
+    </asp:PlaceHolder>
+
+
+    <%--DA VERIFICARE QUESTI in inclusione...--%>
+    <link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
+    <link href="../Content/StyleCustom.css" rel="stylesheet" type="text/css" />
+
    <script language="javascript" type="text/javascript">
        $(document).ready(function () {
            $("span.radioBtn input").checkboxradio({ icon: false });
@@ -20,6 +20,33 @@ public partial class AjaxTitle {
    /// </remarks>
    protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
    
+    /// <summary>
+    /// BundleReference1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+    
+    /// <summary>
+    /// BundleReference2 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+    
+    /// <summary>
+    /// PlaceHolder1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
+    
    /// <summary>
    /// form1 control.
    /// </summary>