Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completata revisione gestioen logo (non duplicato in home e poi riportato in altre pagine su testata)

Browse Source 
Refresh in prod (pronto x creare instalelr DEMO)
This commit is contained in:
Samuele E. Locatelli
2014-09-26 10:38:30 +02:00
parent 38d74c8535
commit 506e1fb367
27 changed files with 201 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/C2P.csproj
+9 -1
View File
@@ -236,6 +236,8 @@
<Content Include="Images\cancel_l.png" />
<Content Include="Images\cancel_m.png" />
<Content Include="Images\cancel_s.gif" />
<Content Include="Images\LogoCostimate_test.png" />
<Content Include="Images\LogoCostimate_prod.png" />
<Content Include="Images\edit_l.png" />
<Content Include="Images\edit_m.png" />
<Content Include="Images\edit_s.png" />
@@ -436,9 +438,12 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Bundle.config" />
<Content Include="Bundle.config">
<SubType>Designer</SubType>
</Content>
<None Include="Service References\RemoteWS\WS_data.wsdl" />
<Content Include="temp\PlaceHolder.file" />
<Content Include="setupTgt.bat" />
<None Include="Web.WinLab.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -949,4 +954,7 @@
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)"</PreBuildEvent>
</PropertyGroup>
</Project>
C2P/Images/LogoCostimate.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 61 KiB

C2P/Images/LogoCostimate_prod.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

C2P/Images/LogoCostimate_test.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

C2P/Images/RoundIcons-Free-Set-29.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

C2P/Images/RoundIcons-Free-Set-55.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

C2P/WebUserControls/mod_testata.ascx
+3 -2
View File
@@ -13,8 +13,9 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" id="A4" runat="server" href="~/Default">
<span style="font-weight: 600; font-size: 1.5em;">CostiMate<sub>line</sub>
</span>
<img src="~/Images/LogoCostimate.png?h=70&w=160&mode=max" alt="Costimate" class="img-responsive" runat="server" id="imgLogo" />
<%--<span style="font-weight: 600; font-size: 1.5em;">CostiMate<sub>line</sub>
</span>--%>
</a>
<div class="subnavbar">
<div class="subnavbar-inner">
C2P/WebUserControls/mod_testata.ascx.cs
+24 -2
View File
@@ -18,6 +18,27 @@ namespace C2P.WebUserControls
///// memorizza la pagina precedente (ovvero la corrente ma non da page-object ma in session...
///// </summary>
//public string _paginaPrecedente;
/// <summary>
/// calcola currentPage
/// </summary>
protected string currPage
{
get
{
return Request.Url.LocalPath.Split('/').Last();
}
}
/// <summary>
/// definisce visibilità logo: sempre SE la pagina non è quella default (su cui il logo è visibile in grande...)
/// </summary>
public bool logoVisible
{
get
{
return currPage != "Default";
}
}
/// <summary>
/// caricamento pagina
/// </summary>
@@ -26,13 +47,14 @@ namespace C2P.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
// se l'utente NON c'è torno a login...
if (!user_std.UtSn.isAuth && Request.Url.LocalPath.Split('/').Last().IndexOf("login") < 0)
if (!user_std.UtSn.isAuth && currPage.IndexOf("login") < 0)
{
Session["nextPage"] = Request.Url.LocalPath.Split('/').Last();
Session["nextPage"] = currPage;
Response.Redirect("login");
}
if (!Page.IsPostBack)
{
imgLogo.Visible = logoVisible;
PagCorrente();
memLayer.ML.emptySessionVal("searchVal");
}
C2P/WebUserControls/mod_testata.ascx.designer.cs
Generated
+9
View File
@@ -38,5 +38,14 @@ namespace C2P.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlAnchor A4;
/// <summary>
/// imgLogo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlImage imgLogo;
}
}
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.xml
+50
View File
@@ -1471,6 +1471,11 @@
<param name="diritto"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.getPage(System.Uri)">
<summary>
restituisce il nome della pagina corrente
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.diritti">
<summary>
restituisce la tabella diritti da session
@@ -1521,6 +1526,16 @@
è un boolean che indica se in session ci siano user/email e DeviceSecret (cookie) e quindi utente autenticato in precedenza...
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.pagCorrente">
<summary>
pagina correntemente visualizzata (URL in sessione)
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.pagPrecedente">
<summary>
pagina precedentemente visualizzata (URL in sessione)
</summary>
</member>
<member name="T:SteamWare.devInfoParam">
<summary>
classe gestione parametri deviceper stampa
@@ -3267,6 +3282,26 @@
<param name="lemma"></param>
<returns></returns>
</member>
<member name="P:SteamWare.UserPage.forceUppercase">
<summary>
indica se i caratteri vadano forzati a maiuscoli
</summary>
</member>
<member name="P:SteamWare.UserPage.isWriteEnabled">
<summary>
determina se l'utente sia abilitato a scrivere nelal pagina corrente (quindi modificare e cancellare...)
</summary>
</member>
<member name="P:SteamWare.UserPage.isPageEnabled">
<summary>
determina se l'utente sia abilitato alla pagina corrente (di base visualizzaizone...)
</summary>
</member>
<member name="P:SteamWare.UserPage.titolo">
<summary>
titolo pagina
</summary>
</member>
<member name="T:SteamWare.ChartType">
<summary>
tipo di chart (2D/3D)
@@ -3560,6 +3595,21 @@
indica se i caratteri vadano forzati a maiuscoli
</summary>
</member>
<member name="P:SteamWare.UserControl.isWriteEnabled">
<summary>
determina se l'utente sia abilitato a scrivere nelal apgina corrente (quindi modificare e cancellare...)
</summary>
</member>
<member name="P:SteamWare.UserControl.isPageEnabled">
<summary>
determina se l'utente sia abilitato alla pagina corrente (di base visualizzaizone...)
</summary>
</member>
<member name="P:SteamWare.UserControl.titolo">
<summary>
titolo pagina
</summary>
</member>
<member name="T:SteamWare.user_std">
<summary>
classe gestione utente: auth e permission/ruoli - versione GENERICA
C2P/setupTgt.bat
+29
View File
@@ -0,0 +1,29 @@
@echo off
echo Effettua setup dei file specifici per caso Develop / Prod pre build installer: verifica da nome configurazione %1
if %1 == "Release" goto Release
if %1 == "Debug" goto Develop
if %1 == "WinLab" goto Prod
if %1 == "Demo" goto Prod
:Release
echo Release: non devo copiare nulla
goto END
:Debug
echo Release: non devo copiare nulla
goto END
:Prod
echo Prod: copio files Prod
copy %2"images\LogoCostimate_prod.png" %2"images\LogoCostimate.png"
goto END
:Develop
echo Develop: copio files Develop
copy %2"images\LogoCostimate_test.png" %2"images\LogoCostimate.png"
goto END
:END
echo Fatto!
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Project/bin/Release/C2P_DB.dacpac
BIN
View File
Binary file not shown.
C2P_Project/bin/Release/C2P_Project.dll
BIN
View File
Binary file not shown.
C2P_Report/Reports/ReportOffers_Q.rdlc
+1 -1
View File
@@ -388,7 +388,7 @@
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="ItemURL">
<Value>="http://10.74.82.218/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
<Value>="http://c2p.steamware.net/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
</Field>
<Field Name="valid">
<DataField>valid</DataField>
C2P_Report/Reports/ReportOffers_S.rdlc
+1 -1
View File
@@ -388,7 +388,7 @@
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="ItemURL">
<Value>="http://10.74.82.218/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
<Value>="http://c2p.steamware.net/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
</Field>
<Field Name="valid">
<DataField>valid</DataField>
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.xml
+70 -13
View File
@@ -1349,18 +1349,6 @@
effettua setup dei connection strings da web.config delal singola applicazione
</summary>
</member>
<member name="M:SteamWare.devicesAuthProxy.clearAllUserData">
<summary>
cancella da session l'utente
</summary>
</member>
<member name="M:SteamWare.devicesAuthProxy.getUserKey(System.String)">
<summary>
cripta in MD5 la stringa in chiaro
</summary>
<param name="chiaro"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.#ctor">
<summary>
Initializes a new instance of the <see cref="T:SteamWare.authProxy"/> class.
@@ -1371,6 +1359,20 @@
Singleton accesso a devicesAuthProxy (static object)
</summary>
</member>
<member name="M:SteamWare.devicesAuthProxy.encodeKey(System.String)">
<summary>
cifra in MD5 la stringa in chiaro
</summary>
<param name="chiaro"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.decodeKey(System.String)">
<summary>
decifra la stringa MD5 in chiaro
</summary>
<param name="cifrato"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.checkUserEmail(System.String)">
<summary>
verifica una email per appartenenza ad un utente VALIDO dell'elenco
@@ -1415,12 +1417,17 @@
</member>
<member name="M:SteamWare.devicesAuthProxy.numAuth(System.String,System.String)">
<summary>
Restitusice il numero dia ttivazioni rimaste x utente dato email e key
Restitusice il numero di attivazioni rimaste x utente dato email e key
</summary>
<param name="UserAuthKey"></param>
<param name="email"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.clearAllUserData">
<summary>
cancella da session l'utente
</summary>
</member>
<member name="M:SteamWare.devicesAuthProxy.isPageEnabled(System.String)">
<summary>
conta il numero di permessi utente per la pagina attuale e restituisce true se ne trova almeno 1
@@ -1464,6 +1471,11 @@
<param name="diritto"></param>
<returns></returns>
</member>
<member name="M:SteamWare.devicesAuthProxy.getPage(System.Uri)">
<summary>
restituisce il nome della pagina corrente
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.diritti">
<summary>
restituisce la tabella diritti da session
@@ -1514,6 +1526,16 @@
è un boolean che indica se in session ci siano user/email e DeviceSecret (cookie) e quindi utente autenticato in precedenza...
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.pagCorrente">
<summary>
pagina correntemente visualizzata (URL in sessione)
</summary>
</member>
<member name="P:SteamWare.devicesAuthProxy.pagPrecedente">
<summary>
pagina precedentemente visualizzata (URL in sessione)
</summary>
</member>
<member name="T:SteamWare.devInfoParam">
<summary>
classe gestione parametri deviceper stampa
@@ -3260,6 +3282,26 @@
<param name="lemma"></param>
<returns></returns>
</member>
<member name="P:SteamWare.UserPage.forceUppercase">
<summary>
indica se i caratteri vadano forzati a maiuscoli
</summary>
</member>
<member name="P:SteamWare.UserPage.isWriteEnabled">
<summary>
determina se l'utente sia abilitato a scrivere nelal pagina corrente (quindi modificare e cancellare...)
</summary>
</member>
<member name="P:SteamWare.UserPage.isPageEnabled">
<summary>
determina se l'utente sia abilitato alla pagina corrente (di base visualizzaizone...)
</summary>
</member>
<member name="P:SteamWare.UserPage.titolo">
<summary>
titolo pagina
</summary>
</member>
<member name="T:SteamWare.ChartType">
<summary>
tipo di chart (2D/3D)
@@ -3553,6 +3595,21 @@
indica se i caratteri vadano forzati a maiuscoli
</summary>
</member>
<member name="P:SteamWare.UserControl.isWriteEnabled">
<summary>
determina se l'utente sia abilitato a scrivere nelal apgina corrente (quindi modificare e cancellare...)
</summary>
</member>
<member name="P:SteamWare.UserControl.isPageEnabled">
<summary>
determina se l'utente sia abilitato alla pagina corrente (di base visualizzaizone...)
</summary>
</member>
<member name="P:SteamWare.UserControl.titolo">
<summary>
titolo pagina
</summary>
</member>
<member name="T:SteamWare.user_std">
<summary>
classe gestione utente: auth e permission/ruoli - versione GENERICA
C2P_Report/setupTgt.bat
+1 -1
View File
@@ -29,7 +29,7 @@ copy %2"Reports\WinLab\*.rdlc" %2"Reports\"
goto END
:218
echo 218: copio files Tekal
echo 218: copio files test interno
del %2"Reports\*.rdl"
del %2"Reports\*.rdlc"
copy %2"Reports\srv218\*.rdlc" %2"Reports\"
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.132.285")]
[assembly: AssemblyFileVersion("1.9.132.285")]
[assembly: AssemblyVersion("2.0.137.299")]
[assembly: AssemblyFileVersion("2.0.137.299")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.132.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.132.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.0.137.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.137.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+