From 322cd860277f7a784e2cd69e41f2ca6b144254d5 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 7 Jan 2021 11:22:48 +0100 Subject: [PATCH] refresh master x GPW Clienti --- GPW_Admin/Content/Site.css | 17 +- GPW_Admin/Content/Site.less | 20 +- GPW_Admin/Content/Site.min.css | 2 +- GPW_Admin/WebMasterPages/BMP.Master | 17 +- GPW_Admin/WebMasterPages/BMP.Master.cs | 45 +- .../WebMasterPages/BMP.Master.designer.cs | 9 + GPW_Admin/WebUserControls/cmp_footer.ascx | 25 +- .../WebUserControls/mod_adminClienti.ascx | 445 +++++++++--------- 8 files changed, 335 insertions(+), 245 deletions(-) diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index 8899882..9e2d619 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -2,13 +2,24 @@ body { padding-top: 50px; padding-bottom: 20px; - /*font: 'Roboto Condensed';*/ + font: 'Roboto Condensed'; } /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - padding-left: 15px; - padding-right: 15px; + /*padding-left: 15px; + padding-right: 15px;*/ +} +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ +} +.textBig { + font-size: 1.5em; } /* Set widths on the form inputs since otherwise they're 100% wide */ input, diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index 87ab4c0..2472d0f 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -2,14 +2,28 @@ body { padding-top: 50px; padding-bottom: 20px; - /*font: 'Roboto Condensed';*/ + font: 'Roboto Condensed'; } /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - padding-left: 15px; - padding-right: 15px; + /*padding-left: 15px; + padding-right: 15px;*/ +} + +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} + +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ +} + +.textBig { + font-size: 1.5em; } /* Set widths on the form inputs since otherwise they're 100% wide */ diff --git a/GPW_Admin/Content/Site.min.css b/GPW_Admin/Content/Site.min.css index 6d93ca8..45386a3 100644 --- a/GPW_Admin/Content/Site.min.css +++ b/GPW_Admin/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file +body{padding-top:50px;padding-bottom:20px;font:'Roboto Condensed';}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/BMP.Master b/GPW_Admin/WebMasterPages/BMP.Master index eb2d587..2408d1a 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master +++ b/GPW_Admin/WebMasterPages/BMP.Master @@ -2,6 +2,7 @@ <%@ Register Src="~/WebUserControls/cmp_menuTop.ascx" TagPrefix="uc1" TagName="cmp_menuTop" %> <%@ Register Src="~/WebUserControls/cmp_footer.ascx" TagPrefix="uc1" TagName="cmp_footer" %> +<%@ Register Src="~/WebUserControls/mod_pageSize.ascx" TagPrefix="uc1" TagName="mod_pageSize" %> @@ -64,10 +65,20 @@
- - - +
+
+ <%: traduci(titolo) %> +
+
+ + +
+
+ +
+
+ \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/BMP.Master.cs b/GPW_Admin/WebMasterPages/BMP.Master.cs index 79d4a79..c6f7ab7 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master.cs +++ b/GPW_Admin/WebMasterPages/BMP.Master.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -26,6 +27,14 @@ namespace GPW_Admin.WebMasterPages } } + public string pagCorrente + { + get + { + return Request.Url.Segments.LastOrDefault(); + } + } + /// /// Imposta visibilità componente search globale /// @@ -41,6 +50,20 @@ namespace GPW_Admin.WebMasterPages } } + public string titolo + { + get + { + string answ = pagCorrente; + ValueType tabPerm = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select($"URL = '{pagCorrente}' OR URL = '{pagCorrente}.aspx'"; + if (tabPerm.Rows.Count > 0) + { + answ = tabPerm[0].NOME; + } + return answ; + } + } + #endregion Public Properties #region Private Methods @@ -50,6 +73,11 @@ namespace GPW_Admin.WebMasterPages // faccio refresh pagina... } + private void mod_pageSize_eh_nuovaSize(object sender, EventArgs e) + { + Response.Redirect(pagCorrente); + } + #endregion Private Methods #region Protected Methods @@ -57,8 +85,23 @@ namespace GPW_Admin.WebMasterPages protected void Page_Load(object sender, EventArgs e) { cmp_footer.eh_doRefresh += Cmp_footer_eh_doRefresh; + mod_pageSize.eh_nuovaSize += new EventHandler(mod_pageSize_eh_nuovaSize); } #endregion Protected Methods + + #region Public Methods + + /// + /// Wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + #endregion Public Methods } } \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/BMP.Master.designer.cs b/GPW_Admin/WebMasterPages/BMP.Master.designer.cs index df399c2..81b9b9f 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master.designer.cs +++ b/GPW_Admin/WebMasterPages/BMP.Master.designer.cs @@ -68,6 +68,15 @@ namespace GPW_Admin.WebMasterPages /// protected global::System.Web.UI.WebControls.ContentPlaceHolder cph1; + /// + /// Controllo mod_pageSize. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::GPW_Admin.WebUserControls.mod_pageSize mod_pageSize; + /// /// Controllo cmp_footer. /// diff --git a/GPW_Admin/WebUserControls/cmp_footer.ascx b/GPW_Admin/WebUserControls/cmp_footer.ascx index 351d7d3..0e8401d 100644 --- a/GPW_Admin/WebUserControls/cmp_footer.ascx +++ b/GPW_Admin/WebUserControls/cmp_footer.ascx @@ -1,18 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_footer" %> -