altri fix grafici (compreso buttons M/F) NON ancora ok quest'ultimo...

This commit is contained in:
Samuele E. Locatelli
2017-09-05 17:04:01 +02:00
parent 39055ef4a2
commit 326196e2be
12 changed files with 162 additions and 76 deletions
Binary file not shown.
+9 -9
View File
@@ -26,7 +26,7 @@
</asp:ObjectDataSource>
</div>
<div class="col-xs-4">
<asp:Button runat="server" ID="btnSave" CssClass="btn btn-success form-control" Text="Salva Gruppo" Width="100%" Enabled="false" OnClick="btnSave_Click" />
<asp:Button runat="server" ID="btnSave" CssClass="btn btn-info form-control" Text="Salva Gruppo" Width="100%" Enabled="false" OnClick="btnSave_Click" />
</div>
</div>
</div>
@@ -65,10 +65,10 @@
<label for="rblSex">Sesso</label>
</div>
<div class="col-xs-9">
<div class="btn-group" data-toggle="buttons">
<div class="btn-group" data-toggle="buttons" role="group">
<asp:RadioButtonList runat="server" ID="rblSex" SelectedValue='<%# Bind("Sesso") %>' RepeatDirection="Horizontal" RepeatLayout="Flow">
<asp:ListItem Value="M" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="F" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="M" type="button" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="F" type="button" class="btn btn-default"></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
@@ -176,7 +176,7 @@
</div>
<div class="row">
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-success form-control" ID="btnInsert" CausesValidation="False" CommandName="Insert" Text="Salva" />
<asp:Button runat="server" CssClass="btn btn-info form-control" ID="btnInsert" CausesValidation="False" CommandName="Insert" Text="Salva" />
</div>
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-default form-control" ID="btnCancel" CausesValidation="False" CommandName="Cancel" Text="Cancel" />
@@ -214,9 +214,9 @@
</div>
<div class="col-xs-9">
<div class="btn-group" data-toggle="buttons">
<asp:RadioButtonList runat="server" ID="rblSex" SelectedValue='<%# Bind("Sesso") %>' RepeatDirection="Horizontal" RepeatLayout="Flow">
<asp:ListItem Value="M" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="F" class="btn btn-default"></asp:ListItem>
<asp:RadioButtonList runat="server" ID="rblSex" SelectedValue='<%# Bind("Sesso") %>' RepeatDirection="Horizontal" RepeatLayout="Flow" CssClass="btn-group btn-group-justified" OnPreRender="rblSex_PreRender" AutoPostBack="true" OnSelectedIndexChanged="rblSex_SelectedIndexChanged" >
<asp:ListItem Value="M" type="button" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="F" type="button" class="btn btn-default"></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
@@ -324,7 +324,7 @@
</div>
<div class="row">
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-success form-control" ID="btnUpdate" CausesValidation="False" CommandName="Update" Text="Update" />
<asp:Button runat="server" CssClass="btn btn-info form-control" ID="btnUpdate" CausesValidation="False" CommandName="Update" Text="Update" />
</div>
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-default form-control" ID="btnCancel" CausesValidation="False" CommandName="Cancel" Text="Cancel" />
+45
View File
@@ -179,5 +179,50 @@ namespace ScheMe
btnSave.Enabled = false;
}
}
/// <summary>
/// Fix grafico radiobuttonlist Sesso
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void rblSex_PreRender(object sender, EventArgs e)
{
RadioButtonList rblTipo = (RadioButtonList)sender;
// applico stile a tutti oggetti listitem!
foreach (ListItem item in rblTipo.Items)
{
item.Attributes.Remove("class");
if (item.Selected)
{
item.Attributes.Add("class", "btn btn-primary btn-xs");
}
else
{
item.Attributes.Add("class", "btn btn-default btn-xs");
}
}
}
/// <summary>
/// update selezione...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void rblSex_SelectedIndexChanged(object sender, EventArgs e)
{
RadioButtonList rblTipo = (RadioButtonList)sender;
// applico stile a tutti oggetti listitem!
foreach (ListItem item in rblTipo.Items)
{
item.Attributes.Remove("class");
if (item.Selected)
{
item.Attributes.Add("class", "btn btn-primary btn-xs");
}
else
{
item.Attributes.Add("class", "btn btn-default btn-xs");
}
}
}
}
}
+2 -13
View File
@@ -51,12 +51,7 @@
<div id="textWrapper">
<asp:UpdatePanel ID="upHead" runat="server">
<ContentTemplate>
<div class="navbar navbar-fixed-top" role="navigation">
<div class="container-fluid">
<uc1:mod_top runat="server" ID="mod_top" />
</div>
</div>
<div style="min-height: 4.5em;"></div>
<uc1:mod_top runat="server" ID="mod_top" />
</ContentTemplate>
</asp:UpdatePanel>
<div class="container-fluid body-content">
@@ -68,13 +63,7 @@
</asp:UpdatePanel>
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<footer>
<div class="navbar navbar-fixed-bottom" role="navigation" style="min-height: 2em; padding-top: 0.4em;">
<div class="container-fluid">
<uc1:mod_bottom runat="server" ID="mod_bottom" />
</div>
</div>
</footer>
<uc1:mod_bottom runat="server" ID="mod_bottom" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
+2 -2
View File
@@ -10,12 +10,12 @@
.smaller {
font-size: 0.7em;
}
.navbar-nav {
.fullWidth > .navbar-nav {
display: table;
width: 100%;
margin: 0;
}
.navbar-nav > li {
.fullWidth > .navbar-nav > li {
float: none;
display: table-cell;
text-align: center;
+2 -2
View File
@@ -27,13 +27,13 @@
font-size: 0.7em;
}
.navbar-nav {
.fullWidth > .navbar-nav {
display: table;
width: 100%;
margin: 0;
}
.navbar-nav > li {
.fullWidth > .navbar-nav > li {
float: none;
display: table-cell;
text-align: center;
+1 -1
View File
@@ -1 +1 @@
.uppercase{text-transform:uppercase;}.bigBtn{min-height:2.2em;font-size:1.2em;}.smaller{font-size:.7em;}.navbar-nav{display:table;width:100%;margin:0;}.navbar-nav>li{float:none;display:table-cell;text-align:center;}.VVF-CL-01{color:#060;background-color:#fff;}.VVF-CL-02{color:#ff3;background-color:#22f;}.VVF-CL-03{color:#ff3;background-color:#181;}.VVF-CL-04{background-color:#ff1;}.VVF-CL-05{color:#ff3;background-color:#e62;}.VVF-CL-06{color:#ff1;background-color:#ff0c0c;}.headerRow{background-color:#eee;color:#000;}.text-center{text-align:center;margin:auto;}.tStrong{font-weight:bold;font-size:1.3em;}.flRight{float:right;}.errore{color:#f00;}.headLine{background-color:#38c;color:#fff;}.hBlock{background-color:#d7d7d7;color:#000;}.hBlockDrk{background-color:#585858;color:#fff;}.fBlock{background-color:#f2f2f2;color:#000;}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em;}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em;}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em;}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff;}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333;}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333;}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef;}.RowStyle{background-color:#eff3fb;text-align:left;}.rowStyle{background-color:#eff3fb;}.editRowStyle{background-color:#2461bf;}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f;}.alternatingRowStyle{background-color:#fff;}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.spacedRow{line-height:3em;}.baseRow{background-color:#eff3fb;}.altRow{background-color:#fff;}.editRow{background-color:#2461bf;}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333;}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em;}.footerRow{background-color:#38c;font-weight:600;color:#fff;}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto;}.stortAscCellStyle{background-color:#f5f7fb;}.stortAscHeadStyle{background-color:#6d95e1;}.stortDescCellStyle{background-color:#e9ebef;}.stortDescHeadStyle{background-color:#4870be;}.GridPager{background-color:#ff7c50;}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold;}.imgNoPad{margin-top:-3px;margin-bottom:-7px;}@media all and (min-width:768px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:2em;}#headData{margin-top:0;}}@media all and (max-width:767px){#textWrapper{font-size:.8em;}#headData{margin-top:6px;}}@media all and (max-width:480px){#textWrapper{font-size:.6em;}#headData{margin-top:14px;}}@media all and (max-width:320px){#textWrapper{font-size:.5em;}#headData{margin-top:18px;}}
.uppercase{text-transform:uppercase;}.bigBtn{min-height:2.2em;font-size:1.2em;}.smaller{font-size:.7em;}.fullWidth>.navbar-nav{display:table;width:100%;margin:0;}.fullWidth>.navbar-nav>li{float:none;display:table-cell;text-align:center;}.VVF-CL-01{color:#060;background-color:#fff;}.VVF-CL-02{color:#ff3;background-color:#22f;}.VVF-CL-03{color:#ff3;background-color:#181;}.VVF-CL-04{background-color:#ff1;}.VVF-CL-05{color:#ff3;background-color:#e62;}.VVF-CL-06{color:#ff1;background-color:#ff0c0c;}.headerRow{background-color:#eee;color:#000;}.text-center{text-align:center;margin:auto;}.tStrong{font-weight:bold;font-size:1.3em;}.flRight{float:right;}.errore{color:#f00;}.headLine{background-color:#38c;color:#fff;}.hBlock{background-color:#d7d7d7;color:#000;}.hBlockDrk{background-color:#585858;color:#fff;}.fBlock{background-color:#f2f2f2;color:#000;}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em;}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em;}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em;}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff;}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333;}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333;}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef;}.RowStyle{background-color:#eff3fb;text-align:left;}.rowStyle{background-color:#eff3fb;}.editRowStyle{background-color:#2461bf;}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f;}.alternatingRowStyle{background-color:#fff;}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.spacedRow{line-height:3em;}.baseRow{background-color:#eff3fb;}.altRow{background-color:#fff;}.editRow{background-color:#2461bf;}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333;}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em;}.footerRow{background-color:#38c;font-weight:600;color:#fff;}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto;}.stortAscCellStyle{background-color:#f5f7fb;}.stortAscHeadStyle{background-color:#6d95e1;}.stortDescCellStyle{background-color:#e9ebef;}.stortDescHeadStyle{background-color:#4870be;}.GridPager{background-color:#ff7c50;}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold;}.imgNoPad{margin-top:-3px;margin-bottom:-7px;}@media all and (min-width:768px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:2em;}#headData{margin-top:0;}}@media all and (max-width:767px){#textWrapper{font-size:.8em;}#headData{margin-top:6px;}}@media all and (max-width:480px){#textWrapper{font-size:.6em;}#headData{margin-top:14px;}}@media all and (max-width:320px){#textWrapper{font-size:.5em;}#headData{margin-top:18px;}}
+17 -12
View File
@@ -1,14 +1,19 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_bottom.ascx.cs" Inherits="ScheMe.WebUserControls.mod_bottom" %>
<ul class="nav navbar-nav" id="divFooterMenu" runat="server">
<li class="nav-item">
<a href="Accettazione" class='<%: liClass("Accettazione") %>'><i class="fa fa-users fa-lg" aria-hidden="true"></i>&nbsp;Accettazione</a>
</li>
<li class="nav-item">
<%--<a href="Valutazioni" class='form-control <%: liClass("Valutazioni") %>'><i class="fa fa-stethoscope fa-lg" aria-hidden="true"></i>&nbsp;Visite</a>--%>
<a href="Valutazioni" class='<%: liClass("Valutazioni") %>'><i class="fa fa-universal-access fa-lg" aria-hidden="true"></i>&nbsp;Valutazioni</a>
</li>
<li class="nav-item">
<a href="Attivita" class='<%: liClass("Attivita") %>'><i class="fa fa-files-o fa-lg" aria-hidden="true"></i>&nbsp;Files</a>
</li>
</ul>
<footer>
<div class="navbar navbar-fixed-bottom" role="navigation" style="min-height: 2em; padding-top: 0.4em;">
<div class="fullWidth">
<ul class="nav navbar-nav" id="divFooterMenu" runat="server">
<li class="nav-item">
<a href="Accettazione" class='<%: liClass("Accettazione") %>'><i class="fa fa-users fa-lg" aria-hidden="true"></i>&nbsp;Accettazione</a>
</li>
<li class="nav-item">
<a href="Valutazioni" class='<%: liClass("Valutazioni") %>'><i class="fa fa-universal-access fa-lg" aria-hidden="true"></i>&nbsp;Valutazioni</a>
</li>
<li class="nav-item">
<a href="Attivita" class='<%: liClass("Attivita") %>'><i class="fa fa-files-o fa-lg" aria-hidden="true"></i>&nbsp;Files</a>
</li>
</ul>
</div>
</div>
</footer>
+43 -28
View File
@@ -1,35 +1,50 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_top.ascx.cs" Inherits="ScheMe.WebUserControls.mod_top" %>
<asp:Timer ID="Timer1" runat="server"></asp:Timer>
<div class="navbar navbar-top headerRow" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topNavbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="fa fa-bars fa-2x"></span>
</button>
<a class="navbar-brand uppercase btn btn-default" href="Default" style="margin: 0 0.5em 0 0; padding: 0.25em;">
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b><br />
<span class="smaller">
<i class="fa fa-home fa-lg" aria-hidden="true"></i>
<asp:Label ID="lblVers" CssClass="small" Height="0.8em" runat="server" Font-Bold="false" />
</span>
</a>
</div>
<div class="row headerRow">
<div class="col-xs-2">
<a href="Default" class="btn btn-default"><i class="fa fa-home fa-lg" aria-hidden="true"></i>
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b>
<asp:Label ID="lblVers" CssClass="small" Height="0.8em" runat="server" Font-Bold="false" />
</a>
</div>
<div class="col-xs-8 uppercase text-center" style="font-size: 1.5em;">
<b><%: titolo %></b>
</div>
<div class="col-xs-2 text-right">
<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="btn btn-default">
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;
<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" /> &nbsp;
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="topNavbar">
<ul class="nav navbar-nav">
<li>
<div class="tStrong headerHighlight uppercase" style="font-size: 1.3em; vertical-align: central; margin: auto;">
<i class="fa fa-user" aria-hidden="true"></i> <%: pazienteSel %>
</div>
<div class="smaller"><%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %></div>
</li>
</ul>
<%--<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>--%>
<ul class="nav navbar-nav navbar-right">
<li class="text-right">
<div>
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" />
<%--<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="btn btn-default">--%>
<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="">
<i class="fa fa-lock fa-lg" aria-hidden="true"></i>
</asp:HyperLink>
</div>
</div>
<div class="row headerRow">
<div class="col-xs-4 col-sm-3 smaller">
<%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %>
</div>
<div class="col-xs-4 col-sm-6 text-center uppercase headerHighlight">
<b><i class="fa fa-user" aria-hidden="true"></i>
<%: pazienteSel %></b>
</div>
<div class="col-xs-4 col-sm-3 smaller text-right">
<i class="fa fa-desktop" aria-hidden="true"></i>
<%: CognomeNome %>
</asp:HyperLink>
</div>
<div class="smaller"><%: CognomeNome %> <i class="fa fa-desktop" aria-hidden="true"></i><%: currentIP %></div>
</li>
</ul>
</div>
</div>
</div>
+32
View File
@@ -48,6 +48,7 @@ namespace ScheMe.WebUserControls
Version versione = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
lblVers.Text = string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision);
lblVers.ToolTip = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.MinorRevision.ToString();
hlUserAdmin.Visible = userIsAdmin;
}
// SOLO se la pagina NON E' "safe"...
if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0)
@@ -124,6 +125,37 @@ namespace ScheMe.WebUserControls
}
}
/// <summary>
/// Restituisce IP corrente
/// </summary>
public string currentIP
{
get
{
string answ = "0.0.0.0";
try
{
answ = Request.UserHostAddress;
}
catch
{ }
return answ;
}
}
public bool userIsAdmin
{
get
{
bool answ = false;
try
{
answ = devicesAuthProxy.stObj.userHasRight("SuperAdmin");
}
catch
{ }
return answ;
}
}
/// <summary>
/// verifica la presenza di un cookie VALIDO per autorizzare il device ed avvia utente...
/// </summary>
private bool checkAuthCookieScheMe()
+9 -9
View File
@@ -30,15 +30,6 @@ namespace ScheMe.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblVers;
/// <summary>
/// Controllo hlUserAdmin.
/// </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.HyperLink hlUserAdmin;
/// <summary>
/// Controllo logoSW.
/// </summary>
@@ -56,5 +47,14 @@ namespace ScheMe.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Image testoSW;
/// <summary>
/// Controllo hlUserAdmin.
/// </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.HyperLink hlUserAdmin;
}
}
Binary file not shown.