Refresh MAG

This commit is contained in:
Samuele Locatelli
2023-09-13 14:50:03 +02:00
parent 696b307241
commit cb7247f86a
9 changed files with 53 additions and 39 deletions
+12 -11
View File
@@ -153,11 +153,11 @@ body {
}
.shortcuts .shortcut {
color: black;
min-width: 10.5rem;
min-height: 6rem;
min-width: 8.4rem;
min-height: 5.04rem;
display: inline-block;
padding: 1rem 0;
margin: 0 2px 1em;
padding: 0.46666667rem 0;
margin: 0 0.1em 0.5em 0.1em;
vertical-align: top;
text-decoration: none;
background: #F3F3F3;
@@ -169,14 +169,15 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 0.75rem;
border-radius: 0.7rem;
font-size: 0.85rem;
}
.shortcuts .shortcut-sm {
color: black;
min-width: 6.75rem;
min-height: 4.5rem;
min-width: 6.3rem;
min-height: 3.36rem;
display: inline-block;
padding: 0.375rem 0;
padding: 0.35rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -189,20 +190,20 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 0.75rem;
border-radius: 0.7rem;
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 3rem;
font-size: 2.8rem;
color: #333;
}
.shortcuts .shortcut-sm .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 3rem;
font-size: 2.8rem;
color: #333;
}
.shortcuts .shortcut:hover {
+7 -6
View File
@@ -183,7 +183,7 @@ body {
[ Shortcuts / .shortcuts ]
*/
@blSCut: 1.5rem;
@blSCut: 1.4rem;
.shortcuts {
text-align: center;
@@ -191,11 +191,11 @@ body {
.shortcuts .shortcut {
color: black;
min-width: (@blSCut * 7);
min-height: (@blSCut * 4);
min-width: (@blSCut * 6);
min-height: (@blSCut * 3.6);
display: inline-block;
padding: (@blSCut * 2 / 3) 0;
margin: 0 2px 1em;
padding: (@blSCut / 3) 0;
margin: 0 0.1em 0.5em 0.1em;
vertical-align: top;
text-decoration: none;
background: #F3F3F3;
@@ -208,12 +208,13 @@ body {
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: (@blSCut / 2);
font-size: 0.85rem;
}
.shortcuts .shortcut-sm {
color: black;
min-width: (@blSCut * 4.5);
min-height: (@blSCut * 3);
min-height: (@blSCut * 2.4);
display: inline-block;
padding: (@blSCut / 4) 0;
margin: 0 2px 1em;
+1 -1
View File
@@ -1 +1 @@
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:10.5rem;min-height:6rem;display:inline-block;padding:1rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:.375rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;}
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px!important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:8.4rem;min-height:5.04rem;display:inline-block;padding:.46666667rem 0;margin:0 .1em .5em .1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.7rem;font-size:.85rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.3rem;min-height:3.36rem;display:inline-block;padding:.35rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.7rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.8rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.8rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;}
+2 -2
View File
@@ -775,7 +775,7 @@
<Content Include="Content\regular.css" />
<Content Include="Content\regular.min.css" />
<Content Include="Content\Site.css">
<DependentUpon>site.less</DependentUpon>
<DependentUpon>Site.less</DependentUpon>
</Content>
<Content Include="Content\Site.min.css">
<DependentUpon>Site.css</DependentUpon>
@@ -1090,7 +1090,7 @@
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
<None Include="Content\site.less" />
<None Include="Content\Site.less" />
<Content Include="Views\Web.config" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
+19 -7
View File
@@ -10,13 +10,25 @@
<div class="card-body">
<div class="row">
<div class="col-12 col-md-10">
<div>Link per accesso diretto tramite lettore portatile:</div>
<ul class="small">
<li>Aprire browser</li>
<li>Selezionare la barra indirizzi</li>
<li>Leggere il codice QR <i class="fa fa-arrow-right" aria-hidden="true"></i></li>
<li>Dalla pagina caricata leggere poi il QR della PackList che si vuole completare dalla <a href="gestPedane" target="_blank">gestione pedane</a></li>
</ul>
<div class="accordion" id="accordionExample">
<div class="accordion-item">
<h2 class="accordion-header" id="headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<div>Accesso diretto lettore portatile</div>
</button>
</h2>
<div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
<div class="accordion-body">
<ul class="small">
<li>Aprire browser</li>
<li>Selezionare la barra indirizzi</li>
<li>Leggere il codice QR <i class="fa fa-arrow-right" aria-hidden="true"></i></li>
<li>Dalla pagina caricata leggere poi il QR della PackList che si vuole completare dalla <a href="gestPedane" target="_blank">gestione pedane</a></li>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-2">
<asp:Image runat="server" ID="imgQrMain" CssClass="img-fluid" />
+8 -8
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_MAG.SMART
@@ -15,11 +15,11 @@ namespace MP_MAG.SMART
{
/// <summary>
/// Controllo imgQrMain.
/// imgQrMain control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgQrMain;
}
+1 -1
View File
@@ -2,7 +2,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="alert alert-secondary p-2">
<div class="alert alert-secondary p-2 mb-2">
<h2>Modulo Magazzino</h2>
<i>Gestione Lotti, stampa etichette UDC prodotti, Anagrafiche Logistiche</i>
</div>
+2 -2
View File
@@ -77,7 +77,7 @@
</ContentTemplate>
</asp:UpdatePanel>
</form>
<%--<%: Scripts.Render("~/bundles/bootstrap") %>--%>
<script src="Scripts/bootstrap.min.js"></script>
<script src="~/Scripts/bootstrap.min.js"></script>
<script src="../Scripts/bootstrap.min.js"></script>
</body>
</html>
+1 -1
View File
@@ -45,7 +45,7 @@
<a class="nav-link text-light" href="SpedScanner"><i class="fas fa-truck-loading"></i>&nbsp;Spedizioni</a>
</li>
</ul>
<div runat="server" id="divSearch" class="form-inline my-2 my-lg-0">
<div runat="server" id="divSearch" class="input-group my-2 my-lg-0">
<asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="[S]earch" aria-label="Search" AccessKey="s" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" />
<asp:LinkButton runat="server" ID="lbtSearch" class="btn btn-secondary my-2 my-sm-0" type="submit" OnClick="lbtSearch_Click">Search <i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>