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

vari fix grafici (da testare x tablet...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-06 19:05:47 +02:00
parent e474cc5b2b
commit b71baf67ac
23 changed files with 98 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C-TRACK/Bundle.config
-2
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/css">
<!--<include path="~/Content/bootstrap.css" />-->
<include path="~/Content/Site.css" />
<include path="~/Content/fontawesome.min.css" />
<include path="~/Content/all.min.css" />
<include path="~/Content/fonts.min.css" />
C-TRACK/C-TRACK.csproj
-1
View File
@@ -152,7 +152,6 @@
</Content>
<Content Include="Content\regular.css" />
<Content Include="Content\regular.min.css" />
<Content Include="Content\Site.css" />
<Content Include="Content\solid.css" />
<Content Include="Content\solid.min.css" />
<Content Include="Content\Style.css">
C-TRACK/Content/Site.css
-31
View File
@@ -1,31 +0,0 @@
/* Move down content because we have a fixed navbar that is 50px tall */
/*body {
padding-top: 50px;
padding-bottom: 20px;
}*/
/* Wrapping element */
/* Set some basic padding to keep content from hitting the edges */
/*.body-content {
padding-left: 15px;
padding-right: 15px;
}*/
/* Set widths on the form inputs since otherwise they're 100% wide */
/*input,
select,
textarea {
max-width: 280px;
}*/
/* Responsive: Portrait tablets and up */
/*@media screen and (min-width: 768px) {
.jumbotron {
margin-top: 20px;
}
.body-content {
padding: 0;
}
}*/
C-TRACK/Content/Style.css
+27 -1
View File
@@ -4,7 +4,7 @@
margin-bottom: 0px;
margin-right: 0px;
font-family: Verdana, Arial;
font-size: small;
font-size: 1rem;
}
.fullscreen {
display: block;
@@ -25,6 +25,32 @@
background-image: url('images/logo_sw.jpg');
background-repeat: no-repeat;
}
/* Responsive: Portrait tablets and up */
@media screen and (max-width: 600px) {
body {
font-size: 0.5rem;
}
}
@media screen and (min-width: 600px) {
body {
font-size: 0.6rem;
}
}
@media screen and (min-width: 1024px) {
body {
font-size: 0.8rem;
}
}
@media screen and (min-width: 1440px) {
body {
font-size: 0.8rem;
}
}
@media screen and (min-width: 1920px) {
body {
font-size: 0.9rem;
}
}
#activeContent {
height: 200px;
}
C-TRACK/Content/Style.less
+29 -1
View File
@@ -5,7 +5,7 @@
margin-bottom: 0px;
margin-right: 0px;
font-family: Verdana, Arial;
font-size: small;
font-size: 1rem;
}
.fullscreen
{
@@ -27,6 +27,34 @@
background-repeat: no-repeat;
}
/* Responsive: Portrait tablets and up */
@media screen and (max-width: 600px) {
body {
font-size: 0.5rem;
}
}
@media screen and (min-width: 600px) {
body {
font-size: 0.6rem;
}
}
@media screen and (min-width: 1024px) {
body {
font-size: 0.8rem;
}
}
@media screen and (min-width: 1440px) {
body {
font-size: 0.8rem;
}
}
@media screen and (min-width: 1920px) {
body {
font-size: 0.9rem;
}
}
#activeContent
{
height: 200px;
C-TRACK/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
C-TRACK/WebMasterPages/Bootstrap.Master
+2 -5
View File
@@ -24,9 +24,9 @@
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%--<%: Scripts.Render("~/bundles/BrowserWindowSize") %>--%>
</asp:PlaceHolder>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<%--<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />--%>
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
</head>
@@ -71,8 +71,5 @@
</div>
</footer>
</form>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
</asp:PlaceHolder>
</body>
</html>
C-TRACK/WebMasterPages/Bootstrap.Master.designer.cs
Generated
+9 -18
View File
@@ -21,6 +21,15 @@ namespace C_TRACK.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// Controllo BundleReference1.
/// </summary>
@@ -92,23 +101,5 @@ namespace C_TRACK.WebMasterPages {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::C_TRACK.WebUserControls.mod_footer mod_footer;
/// <summary>
/// Controllo PlaceHolder2.
/// </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.PlaceHolder PlaceHolder2;
/// <summary>
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
}
}
C-TRACK/WebUserControls/mod_btnComandi.ascx
+4 -4
View File
@@ -3,15 +3,15 @@
<div class="row my-2">
<asp:Repeater runat="server" ID="repComandi" DataSourceID="odsCmd">
<ItemTemplate>
<div class="col-12 col-sm-6 py-1">
<asp:LinkButton ID="LinkButton1" runat="server" CssClass='<%# "btn text-truncate btn-block btn-info " + cssEnabled %>' OnClick="lbtCmd_Click" CommandArgument='<%# Eval("CodFase") %>'>
<div class="col-6 py-1">
<asp:LinkButton ID="LinkButton1" runat="server" CssClass='<%# "btn btn-sm text-truncate btn-block btn-info " + cssEnabled %>' OnClick="lbtCmd_Click" CommandArgument='<%# Eval("CodFase") %>'>
<i class="fa fa-plus"></i> <%# Eval("DescrFase") %>
</asp:LinkButton>
</div>
</ItemTemplate>
<AlternatingItemTemplate>
<div class="col-12 col-sm-6 py-1">
<asp:LinkButton ID="LinkButton1" runat="server" CssClass='<%# "btn text-truncate btn-block btn-dark " + cssEnabled %>' OnClick="lbtCmd_Click" CommandArgument='<%# Eval("CodFase") %>'>
<div class="col-6 py-1">
<asp:LinkButton ID="LinkButton1" runat="server" CssClass='<%# "btn btn-sm text-truncate btn-block btn-dark " + cssEnabled %>' OnClick="lbtCmd_Click" CommandArgument='<%# Eval("CodFase") %>'>
<i class="fa fa-plus"></i> <%# Eval("DescrFase") %>
</asp:LinkButton>
</div>
C-TRACK/WebUserControls/mod_checkOpr.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<div runat="server" id="divWarning" class="mt-0 mb-3">
<div class="row bg-danger text-warning text-center">
<div class="col">
<h1>Operatore non dichiarato</h1>
<h3>Operatore non dichiarato</h3>
E' necessario dichiarare l'operatore corrente per proseguire.
</div>
</div>
C-TRACK/WebUserControls/mod_checkPost.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<div runat="server" id="divWarning" class="mt-0 mb-3">
<div class="row bg-danger text-warning text-center">
<div class="col">
<h1>Postazione non definita</h1>
<h3>Postazione non definita</h3>
E' necessario selezionare la postazione corrente per proseguire.
</div>
</div>
C-TRACK/WebUserControls/mod_fasiAttive.ascx
+4 -4
View File
@@ -4,13 +4,13 @@
<div class="card border-primary">
<div class="card-header text-center border-primary bg-primary text-light py-1">
<div class="row">
<div class="col-2">
<div class="col-4">
</div>
<div class="col-8">
<div class="col-4">
<b>Fasi Attive</b>
</div>
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtCloseAll" CssClass="btn btn-warning btn-block" OnClick="lbtCloseAll_Click"><i class="fas fa-times-circle"></i> Chiudi tutte</asp:LinkButton>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtCloseAll" CssClass="btn btn-sm btn-warning btn-block text-truncate" OnClick="lbtCloseAll_Click"><i class="fas fa-times-circle"></i> Chiudi tutte</asp:LinkButton>
</div>
</div>
</div>
C-TRACK/WebUserControls/mod_menuTopCompact.ascx
+11 -11
View File
@@ -1,29 +1,29 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_menuTopCompact" %>
<div class="row text-uppercase align-items-center w-100 mx-0 px-0">
<div class="col-12 col-sm-4 col-md-3 my-2 text-left">
<asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-lg btn-block btn-primary">
<div class="col-4 col-md-3 my-2 text-left">
<asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-block btn-primary text-truncate">
<i class="fas fa-tasks"></i> Task
</asp:HyperLink>
</div>
<div class="col-12 col-sm-4 col-md-6 my-0 text-center">
<asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/barcode" CssClass="btn btn-lg btn-block btn-light">
<div class="col-4 col-md-6 my-0 text-center">
<asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/barcode" CssClass="btn btn-block btn-light text-truncate">
<asp:Label ID="lblTitolo" runat="server" Text="" CssClass="font-weight-bold" />
</asp:HyperLink>
</div>
<div class="col-12 col-sm-4 col-md-3 my-2 text-right">
<asp:HyperLink runat="server" ID="hlPostazioni" NavigateUrl="~/postazioni" CssClass="btn btn-lg btn-block btn-primary">
<div class="col-4 col-md-3 my-2 text-right">
<asp:HyperLink runat="server" ID="hlPostazioni" NavigateUrl="~/postazioni" CssClass="btn btn-block btn-primary text-truncate">
<i class="fas fa-industry"></i> Postazioni
</asp:HyperLink>
</div>
</div>
<div class="row text-uppercase align-items-center w-100 mx-0 px-0">
<div class="col-12 col-sm-4 text-left">
<%: CodOpr %> | <%: NomeOpr %>
<div class="col-4 text-left text-truncate">
<%: NomeOpr %>
</div>
<div class="col-12 col-sm-4 text-center">
<div class="col-4 text-center text-truncate">
<%: CurrNumTask %>
</div>
<div class="col-12 col-sm-4 text-right">
<%: CodPost %> | <%: DescPost %>
<div class="col-4 text-right text-truncate">
<%: DescPost %>
</div>
</div>
C-TRACK/WebUserControls/mod_postazioni.ascx
+4 -4
View File
@@ -19,15 +19,15 @@
<%--<asp:BoundField DataField="PreselFasi" HeaderText="PreselFasi" SortExpression="PreselFasi" />--%>
<asp:TemplateField HeaderText="Descrizione" SortExpression="Descrizione">
<ItemTemplate>
<h3>
<b style="font-size:1.2rem;">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("Descrizione") %>'></asp:Label>
</h3>
</b>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Operatore" SortExpression="Operatore">
<ItemTemplate>
<i class="fas fa-2x fa-user"></i><b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("Operatore") %>'></asp:Label></b>
<i class="fas fa-3x fa-user"></i><span>
<asp:Label ID="Label2" runat="server" style="font-size:1.1rem;" Text='<%# Eval("Operatore") %>'></asp:Label></span>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-Width="2em">
C-TRACK/barcode.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="Server">
<div class="card">
<div class="card-header text-center">
<h2>Gestione Dichiarazioni</h2>
<h3>Gestione Dichiarazioni</h3>
</div>
<div class="card-body">
<uc1:mod_checkOpr runat="server" ID="mod_checkOpr" />
C-TRACK/postazioni.aspx
+2 -2
View File
@@ -9,8 +9,8 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
<div class="card">
<div class="card-header text-right text-primary">
<h2>Gestione Postazioni</h2>
<div class="card-header text-center text-primary">
<h3>Gestione Postazioni</h3>
</div>
<div class="card-body">
<uc1:mod_checkOpr runat="server" ID="mod_checkOpr" />
C-TRACK/task.aspx
+2 -2
View File
@@ -9,8 +9,8 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
<div class="card">
<div class="card-header text-left text-primary">
<h2>Gestione Commesse</h2>
<div class="card-header text-center text-primary">
<h3>Gestione Commesse</h3>
</div>
<div class="card-body">
<%--<h5 class="card-title">Special title treatment</h5>
Setup_Files/ElettronicaScalvina/BCode_Utenti.pdf
BIN
View File
Binary file not shown.
Setup_Files/ElettronicaScalvina/Cartellini Elettronica Scalvina.xlsx
BIN
View File
Binary file not shown.
Setup_Files/ElettronicaScalvina/Copia di ElencoUtenti_ElettronicaScalvina.xlsx
BIN
View File
Binary file not shown.
Setup_Files/ElettronicaScalvina/QR_PowerUser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

Setup_Files/ElettronicaScalvina/QR_code_dispositivi.pdf
BIN
View File
Binary file not shown.
Setup_Files/ElettronicaScalvina/QR_user.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB