Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update master x componenti js

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-04 07:39:33 +02:00
parent 570ef37592
commit 69ef7d06f3
4 changed files with 102 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Commesse/GPW_Commesse.csproj
+25
View File
@@ -140,6 +140,10 @@
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
@@ -165,6 +169,12 @@
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
@@ -233,6 +243,8 @@
<Content Include="Content\BuildBlocks.min.css">
<DependentUpon>BuildBlocks.css</DependentUpon>
</Content>
<Content Include="Content\Chart.css" />
<Content Include="Content\Chart.min.css" />
<Content Include="Content\ExtraComp.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css">
@@ -355,6 +367,8 @@
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
<Content Include="Scripts\bootstrap.bundle.js.map" />
<Content Include="Scripts\Chart.js" />
<Content Include="Scripts\Chart.min.js" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
<Content Include="Scripts\esm\popper.js" />
@@ -444,6 +458,7 @@
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="WebMasterPages\AjaxSimpleFull.Master" />
<Content Include="WebUserControls\cmp_chart.ascx" />
<Content Include="WebUserControls\cmp_rilTemp.ascx" />
<Content Include="WebUserControls\cmp_toggle.ascx" />
<Content Include="WebUserControls\mod_autocomplete.ascx" />
@@ -565,6 +580,7 @@
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
@@ -575,6 +591,8 @@
<Compile Include="commesseUtente.aspx.designer.cs">
<DependentUpon>commesseUtente.aspx</DependentUpon>
</Compile>
<Compile Include="Controllers\TempHistController.cs" />
<Compile Include="Controllers\TempRilController.cs" />
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -614,6 +632,13 @@
<Compile Include="WebMasterPages\AjaxSimpleFull.Master.designer.cs">
<DependentUpon>AjaxSimpleFull.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_chart.ascx.cs">
<DependentUpon>cmp_chart.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_chart.ascx.designer.cs">
<DependentUpon>cmp_chart.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_rilTemp.ascx.cs">
<DependentUpon>cmp_rilTemp.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
GPW_Commesse/GPW_Commesse.csproj.user
+8
View File
@@ -11,6 +11,14 @@
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
GPW_Commesse/WebMasterPages/AjaxSimple.master
+6 -3
View File
@@ -9,9 +9,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GPW <%: Page.Title %></title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jsMoment") %>
<%: Scripts.Render("~/bundles/jsChart") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master
+63 -60
View File
@@ -7,75 +7,78 @@
<!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>GPW <%: Page.Title %></title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GPW <%: Page.Title %></title>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jsMoment") %>
<%: Scripts.Render("~/bundles/jsChart") %>
</asp:PlaceHolder>
<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" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
<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 href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />--%>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
<script lang="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
<%-- <link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />--%>
// 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
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
<script lang="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
// 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
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
});
});
});
});
</script>
</script>
</head>
<body class="body">
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
<div class="col-12">
<uc1:mod_menuTopFull ID="mod_menuTopFull1" runat="server" titolo="Gestione Commesse Utente" returnUrl="../HOME/" />
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
<div class="col-12">
<uc1:mod_menuTopFull ID="mod_menuTopFull1" runat="server" titolo="Gestione Commesse Utente" returnUrl="../HOME/" />
</div>
</div>
<div class="row my-5">
<div class="col-12">
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="row">
<div class="col-12">
<uc1:mod_menuBottomFullpage runat="server" ID="mod_menuBottomFullpage" />
</div>
</div>
</div>
</div>
<div class="row my-5">
<div class="col-12">
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="row">
<div class="col-12">
<uc1:mod_menuBottomFullpage runat="server" ID="mod_menuBottomFullpage" />
</div>
</div>
</div>
</form>
</form>
</body>
</html>