Ok home
Ok vocabolario Fix Gitignore
This commit is contained in:
@@ -31,6 +31,7 @@ Thumbs.db
|
||||
CMS_SC/obj/*
|
||||
CMS_SC/logs/*.txt
|
||||
CMS_SC/logs/*.zip
|
||||
CMS_SC/imagecache/*
|
||||
|
||||
#--------------------------------------------
|
||||
# VersGen
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,5 @@
|
||||
C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.dll
|
||||
C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.pdb
|
||||
C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.csprojResolveAssemblyReference.cache
|
||||
C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll
|
||||
C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.pdb
|
||||
Binary file not shown.
@@ -230,7 +230,8 @@
|
||||
<Content Include="Images\bullet.png" />
|
||||
<Content Include="Images\heroAccent.png" />
|
||||
<Content Include="Images\loader.gif" />
|
||||
<Content Include="Images\LogoApp.png" />
|
||||
<Content Include="Images\LogoCms.png" />
|
||||
<Content Include="Images\LogoHomeDx.png" />
|
||||
<Content Include="Images\LogoSteamware.png" />
|
||||
<Content Include="Images\orderedList0.png" />
|
||||
<Content Include="Images\orderedList1.png" />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using SteamWare;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
@@ -11,7 +12,9 @@ namespace CMS_SC
|
||||
{
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
// resetto i dati utente all'accesso alla pagina default...
|
||||
devicesAuthProxy.stObj.clearAllUserData();
|
||||
Response.Redirect("Home");
|
||||
}
|
||||
}
|
||||
}
|
||||
+15
-14
@@ -2,14 +2,15 @@
|
||||
|
||||
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
|
||||
<div class="row" style="margin-top: -10px;">
|
||||
<div class="col-xs-5">
|
||||
<div style="color: #ee8800; margin-top: 60px;">
|
||||
<img src="Images/LogoCostimate.png?h=121&w=458&mode=max" alt="Costimate" class="img-responsive" />
|
||||
</div>
|
||||
<p>Cost to Price for Extrusion</p>
|
||||
<div class="col-xs-6" style="color: #ee8800; padding: 10px 30px; text-align: left;">
|
||||
<img src="Images/LogoCms.png?h=120&w=480" alt="Costimate" class="img-responsive" />
|
||||
</div>
|
||||
<div class="col-xs-6" style="color: #ee8800; padding: 10px 30px; float: right;">
|
||||
<img src="Images/LogoHomeDx.png?h=120&w=480" alt="" class="img-responsive" />
|
||||
</div>
|
||||
<div class="col-xs-12" style="color: #ABABAB; text-align: center; margin: auto; padding: 30px; float: none;">
|
||||
<h1>Gestione Schede Collaudo</h1>
|
||||
</div>
|
||||
<div class="col-xs-6 col-xs-offset-1 text-right" style="margin-top: 10px;">
|
||||
<img src="Images/extrusion.png" alt="" class="img-responsive" /></div>
|
||||
</div>
|
||||
</asp:Content>
|
||||
<asp:Content runat="server" ID="BodyContent" ContentPlaceHolderID="MainContent">
|
||||
@@ -22,21 +23,21 @@
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="shortcuts">
|
||||
<asp:HyperLink runat="server" ID="HyperLink2" class="shortcut" NavigateUrl="ExistingProductOffer">
|
||||
<%--<asp:HyperLink runat="server" ID="HyperLink2" class="shortcut" NavigateUrl="ExistingProductOffer">
|
||||
<i class="fa fa-cubes shortcut-icon"></i> <span class="shortcut-label"><%: traduci("ExistProdOff") %></span>
|
||||
</asp:HyperLink>
|
||||
</asp:HyperLink>--%>
|
||||
<asp:HyperLink runat="server" ID="HyperLink3" class="shortcut" NavigateUrl="NewProductOffer">
|
||||
<i class="fa fa-cube shortcut-icon"></i> <span class="shortcut-label"><%: traduci("NewProdOff") %></span>
|
||||
<i class="fa fa-cube shortcut-icon"></i> <span class="shortcut-label"><%: traduci("NewSC") %></span>
|
||||
</asp:HyperLink>
|
||||
<asp:HyperLink runat="server" ID="HyperLink4" class="shortcut" NavigateUrl="OffersArchive">
|
||||
<i class="fa fa-database shortcut-icon"></i> <span class="shortcut-label"><%: traduci("OffersArchive") %></span>
|
||||
<i class="fa fa-database shortcut-icon"></i> <span class="shortcut-label"><%: traduci("Archive") %></span>
|
||||
</asp:HyperLink>
|
||||
<asp:HyperLink runat="server" ID="HyperLink5" class="shortcut" NavigateUrl="MarginReport">
|
||||
<i class="fa fa-eur shortcut-icon"></i> <span class="shortcut-label"><%: traduci("MarginReport") %></span>
|
||||
<%--<asp:HyperLink runat="server" ID="HyperLink5" class="shortcut" NavigateUrl="MarginReport">
|
||||
<i class="fa fa-eur shortcut-icon"></i> <span class="shortcut-label"><%: traduci("Report") %></span>
|
||||
</asp:HyperLink>
|
||||
<asp:HyperLink runat="server" ID="HyperLink6" class="shortcut" NavigateUrl="StdCostList">
|
||||
<i class="fa fa-calculator shortcut-icon"></i> <span class="shortcut-label"><%: traduci("StdCostList") %></span>
|
||||
</asp:HyperLink>
|
||||
</asp:HyperLink>--%>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Generated
-27
@@ -12,15 +12,6 @@ namespace CMS_SC {
|
||||
|
||||
public partial class Home {
|
||||
|
||||
/// <summary>
|
||||
/// HyperLink2 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HyperLink HyperLink2;
|
||||
|
||||
/// <summary>
|
||||
/// HyperLink3 control.
|
||||
/// </summary>
|
||||
@@ -38,23 +29,5 @@ namespace CMS_SC {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HyperLink HyperLink4;
|
||||
|
||||
/// <summary>
|
||||
/// HyperLink5 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HyperLink HyperLink5;
|
||||
|
||||
/// <summary>
|
||||
/// HyperLink6 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HyperLink HyperLink6;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 101 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
@@ -13,7 +13,7 @@
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" id="A4" runat="server" href="~/Default">
|
||||
<img src="~/Images/LogoApp.png?h=70&w=160&mode=max" alt="Costimate" class="img-responsive" runat="server" id="imgLogo" />
|
||||
<img src="~/Images/LogoCms.png?h=70&w=160&mode=max" alt="Costimate" class="img-responsive" runat="server" id="imgLogo" />
|
||||
</a>
|
||||
<div class="subnavbar">
|
||||
<div class="subnavbar-inner">
|
||||
|
||||
@@ -161,8 +161,10 @@ namespace CMS_SC.WebUserControls
|
||||
device = devicesAuthProxy.stObj.taAnagDev.getByDeviceSecret(devSecret)[0];
|
||||
email = device.USER_NAME;
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
catch(Exception exc)
|
||||
{
|
||||
logger.lg.scriviLog(string.Format("{0}", exc), tipoLog.EXCEPTION);
|
||||
}
|
||||
if (email != "")
|
||||
{
|
||||
// aggiorno descrizione (user agent) ed IP...
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 273 KiB |
Binary file not shown.
Reference in New Issue
Block a user