diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 0e72588..7b45a74 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Content/Site.css b/PROJ-ETS/PROJ-ETS/Content/Site.css index 0a6a5ab..afe640f 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Site.css +++ b/PROJ-ETS/PROJ-ETS/Content/Site.css @@ -183,8 +183,8 @@ ul#menu { ul#menu li { display: inline; list-style: none; - padding-left: 15px; - padding-right: 15px; + padding-left: 10px; + /*padding-right: 10px;*/ border-left: 1px solid #DEDEDE; } diff --git a/PROJ-ETS/PROJ-ETS/Images/bazaar_white.png b/PROJ-ETS/PROJ-ETS/Images/bazaar_white.png new file mode 100644 index 0000000..3da27ac Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/bazaar_white.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/help_white.png b/PROJ-ETS/PROJ-ETS/Images/help_white.png new file mode 100644 index 0000000..09a7357 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/help_white.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/progetto_white.png b/PROJ-ETS/PROJ-ETS/Images/progetto_white.png new file mode 100644 index 0000000..975d20d Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/progetto_white.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/tools_white.png b/PROJ-ETS/PROJ-ETS/Images/tools_white.png new file mode 100644 index 0000000..8eb0fbd Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/tools_white.png differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index fb13694..29b49c5 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -197,6 +197,7 @@ + @@ -252,6 +253,7 @@ + @@ -275,6 +277,7 @@ + @@ -289,6 +292,7 @@ + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index 44e5c22..e982b32 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -149,9 +149,7 @@ CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) %>' />   - <%-- - --%> + ImageUrl="../images/elimina_m.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxFase")) %>' OnClientClick="return confirm('Confermi eliminazione record?')"/> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx index 9fecc8b..424246f 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx @@ -168,9 +168,7 @@ - <%-- - --%> + ImageUrl="../images/elimina_s.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxProgetto")) %>' OnClientClick="return confirm('Confermi eliminazione record?')" /> <% } %>
-
+

-
+

- <%----%> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs index 91cd250..cb17c7e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs @@ -48,6 +48,42 @@ namespace PROJ_ETS.WebUserControls { /// protected global::System.Web.UI.WebControls.Image Image1; + ///

+ /// Image2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image2; + + /// + /// Image3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image3; + + /// + /// Image4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image4; + + /// + /// Image5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image5; + /// /// btnUpdate control. /// diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 0e72588..7b45a74 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 11dfd0b..4464d9c 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c697bf4..71350de 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache index 18f5330..46ddf9d 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll index 11dfd0b..4464d9c 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ