Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test menu laterale

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-09 11:21:53 +01:00
parent 83c03664aa
commit d79108db5b
17 changed files with 157 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=688']) {
withEnv(['NEXT_BUILD_NUMBER=689']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/App_Start/BundleConfig.cs
+3
View File
@@ -37,6 +37,9 @@ namespace MoonProTablet
bundles.Add(new ScriptBundle("~/bundles/BrowserWindowSize").Include(
"~/Scripts/BrowserWindowSize.js"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.bundle.js"));
//bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include(
// "~/Scripts/jquery-ui-i18n.min.js"));
MP-Tablet/Content/baseStyle.css
+2 -1
View File
@@ -56,7 +56,7 @@ body .ui-overlay-c {
border-bottom-right-radius: 0;
}
/* END: gestione blocchi base */
/* gestione sidenav */
/* ----------- gestione sidenav ----------- */
@media (max-width: 576px) {
.modal-dialog.modal-dialog-slideout {
width: 80%;
@@ -79,6 +79,7 @@ body .ui-overlay-c {
.modal-dialog-slideout .modal-content {
border: 0;
}
/* ----------- END SideNav ----------- */
/* Style page content - use this if you want to push the page content to the right when you open the side navigation */
#main {
transition: margin-left 0.5s;
MP-Tablet/Content/baseStyle.less
+4 -1
View File
@@ -63,7 +63,7 @@ body {
}
/* END: gestione blocchi base */
/* gestione sidenav */
/* ----------- gestione sidenav ----------- */
@media (max-width: 576px) {
.modal-dialog.modal-dialog-slideout {
width: 80%
@@ -90,6 +90,9 @@ body {
.modal-dialog-slideout .modal-content {
border: 0;
}
/* ----------- END SideNav ----------- */
/* Style page content - use this if you want to push the page content to the right when you open the side navigation */
#main {
MP-Tablet/MP-Tablet.csproj
-1
View File
@@ -395,7 +395,6 @@
<Content Include="Scripts\jquery-ui-1.12.1.min.js" />
<Content Include="Scripts\jquery-ui-i18n.js" />
<Content Include="Scripts\jquery-ui-i18n.min.js" />
<Content Include="Scripts\jSteamware.js" />
<Content Include="Scripts\modernizr-2.8.3.js" />
<Content Include="Scripts\popper-utils.js" />
<Content Include="Scripts\popper-utils.min.js" />
MP-Tablet/Test.aspx
+1 -7
View File
@@ -2,12 +2,6 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<h1>PROVA SLIDEOUT</h1>
<h1>PROVA SLIDEOUT</h1>
</asp:Content>
MP-Tablet/User.aspx
-2
View File
@@ -2,8 +2,6 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3">
<div class="card text-dark ">
MP-Tablet/Web.config
+1 -1
View File
@@ -57,7 +57,7 @@
<add key="intUpdatePagina_ms" value="1000" />
<!--!!!FARE!!! riportare a 0!!!-->
<add key="refrMSE_5" value="5" />
<add key="dtTimerInt" value="10000" />
<add key="dtTimerInt" value="3000" />
<!-- Logging -->
<add key="_logDir" value="~/logs/" />
<add key="_logLevel" value="7" />
MP-Tablet/WebMasterPages/Bootstrap.Master
+44 -45
View File
@@ -29,54 +29,53 @@
</head>
<body>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<uc1:mod_title runat="server" id="mod_title" />
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel ID="uppFeatured" runat="server">
<ContentTemplate>
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="bodyDark">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
<div class="container-fluid">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<uc1:mod_title runat="server" ID="mod_title" />
</ContentTemplate>
</asp:UpdatePanel>
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark">
<div class="col-12">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
</div>
</asp:ContentPlaceHolder>
</div>
</asp:ContentPlaceHolder>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<uc1:mod_footer runat="server" ID="mod_footer" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<uc1:mod_footer runat="server" ID="mod_footer" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
</form>
<script src="Scripts/bootstrap.min.js"></script>
<%--<script src="Scripts/bootstrap.min.js"></script>--%>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/bootstrap") %>
</asp:PlaceHolder>
</body>
</html>
MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs
Generated
-18
View File
@@ -84,24 +84,6 @@ namespace WebMasterPages {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_title mod_title;
/// <summary>
/// Controllo uppFeatured.
/// </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.UpdatePanel uppFeatured;
/// <summary>
/// Controllo FeaturedContent.
/// </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 FeaturedContent;
/// <summary>
/// Controllo uppContainer.
/// </summary>
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master
+2 -3
View File
@@ -49,8 +49,6 @@
<uc1:mod_title runat="server" id="mod_title" />
</ContentTemplate>
</asp:UpdatePanel>
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
</asp:ContentPlaceHolder>
<div style="background-color: white;">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
@@ -77,8 +75,9 @@
</ContentTemplate>
</asp:UpdatePanel>
</form>
<script src="Scripts/bootstrap.min.js"></script>
<%--<script src="Scripts/bootstrap.min.js"></script>--%>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/bootstrap") %>
</asp:PlaceHolder>
</body>
</html>
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs
Generated
-9
View File
@@ -84,15 +84,6 @@ namespace WebMasterPages {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_title mod_title;
/// <summary>
/// Controllo FeaturedContent.
/// </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 FeaturedContent;
/// <summary>
/// Controllo MainContent.
/// </summary>
MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettMacchina.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettMacchina" %>
<%--Riporto dettaglio singola macchina--%>
<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always">
<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always" >
<ContentTemplate>
<asp:Panel runat="server" ID="pnlFullDet">
<div class="row">
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+14
View File
@@ -85,5 +85,19 @@ namespace MoonProTablet.WebUserControls
pnlFullDet.Visible = full;
pnlLessDet.Visible = !full;
}
/// <summary>
/// Determina se il refresh (via timer) sia o meno abilitato
/// </summary>
public bool refreshEnabled
{
get
{
return dmTimer.Enabled;
}
set
{
dmTimer.Enabled = value;
}
}
}
}
MP-Tablet/WebUserControls/mod_title.ascx
+68 -36
View File
@@ -1,57 +1,90 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
<div class="modal fade text-dark" id="elencoMacchine" tabindex="-1" role="dialog" aria-labelledby="elencoMacchine" aria-hidden="true">
<div class="modal fade text-dark" id="MainSideMenu" tabindex="-1" role="dialog" aria-labelledby="MainSideMenu" aria-hidden="true">
<div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Steamware MPTAB</h5><br />
<small>Main Menu</small>
<div class="d-flex flex-row">
<div class="p-0">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<h5 class="modal-title">Steamware MPTAB</h5>
</div>
<div class="flex-row">
<small>Main Menu</small>
</div>
</div>
</div>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">
...
<div class="d-flex">
<div class="flex-row">
<div class="p-2">
Mappa Stato
</div>
<div class="p-2">
<div class="btn-group">
<button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
ELENCO IMPIANTI
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Separated link</a>
</div>
</div>
</div>
<div class="p-2">
Dettaglio macchina
<div class="p-2">
Produzione
</div>
<div class="p-2">
ODL / Attrezzaggio
</div>
<div class="p-2">
Gest Turni
</div>
<div class="p-2">
Fermate
</div>
<div class="p-2">
Commenti
</div>
<div class="p-2">
Controlli
</div>
</div>
<div class="p-2">
Storico TC
</div>
<div class="p-2">
Utente
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Chiudi</button>
<button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="exampleModal2" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel2" aria-hidden="true">
<div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Modal sideout small</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">
...
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
</div>
<nav class="navbar navbar-expand fixed-top navbar-dark bg-black my-0 py-0 text-light px-2 titleBlock">
<a class="navbar-brand p-0 align-text-bottom" href="." data-toggle="modal" data-target="#elencoMacchine">
<asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
<nav class="navbar navbar-expand-md fixed-top navbar-dark bg-black my-0 py-0 text-light px-2 titleBlock">
<a class="navbar-brand p-0 align-text-bottom" href="." data-toggle="modal" data-target="#MainSideMenu">
<asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="32px" CssClass="img-fluid" />
<strong>MPTAB</strong>
</a>
<%-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal2">
DEMO
</button>--%>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -60,7 +93,7 @@
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<li class='nav-item btn px-2 py-0 <%# checkPage(Eval("NavigateUrl")) %>' style="min-width: 4em;">
<asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link px-0 py-1" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i><br /><%# Eval("Testo") %> </asp:HyperLink>
<asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link px-0 py-1" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i><br /><%# Eval("Testo") %></asp:HyperLink>
</li>
</ItemTemplate>
</asp:Repeater>
@@ -84,6 +117,5 @@
</div>
</div>
</nav>
<div class="mb-3">&nbsp;</div>
<div class="mb-3">&nbsp;</div>
<div class="mb-sm-4">&nbsp;</div>
MP-Tablet/WebUserControls/mod_title.ascx.cs
+7
View File
@@ -2,6 +2,7 @@
using SteamWare;
using System;
using System.Web;
using System.Web.UI;
namespace MoonProTablet.WebUserControls
{
@@ -32,6 +33,11 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
// prima apertura registro NO popup = refresh enabled
if(!Page.IsPostBack)
{
memLayer.ML.setSessionVal("refreshEnabled", true);
}
// se ho user/dominio e matricola in sessione NON controllo coockie
if (user_std.UtSn.utente == "" || user_std.UtSn.dominio == "" || DataLayer.MatrOpr == 0)
{
@@ -193,5 +199,6 @@ namespace MoonProTablet.WebUserControls
return devicesAuthProxy.getPage(Request.Url);
}
}
}
}
MP-Tablet/WebUserControls/mod_title.ascx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_title {
/// <summary>
/// Controllo logo.
/// </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.Image logo;
/// <summary>
/// Controllo logoSW.
/// </summary>